Merge pull request #4 from pre-commit/master

merge from upstream

pre_commit_hooks/autopep8_wrapper.py

@@ -17,7 +17,7 @@ def main(argv=None):
         original_contents = io.open(filename).read()
         new_contents = autopep8.fix_code(original_contents, args)
         if original_contents != new_contents:
-            print('Fixing {0}'.format(filename))
+            print('Fixing {}'.format(filename))
             retv = 1
             with io.open(filename, 'w') as output_file:
                 output_file.write(new_contents)

pre_commit_hooks/check_added_large_files.py

@@ -26,10 +26,10 @@ def lfs_files():
         assert mode in ('A', 'R')
         return filepart if mode == 'A' else filepart.split(' -> ')[1]
 
-    return set(
+    return {
         to_file_part(mode, filepart) for mode, filepart in modes_and_fileparts
         if mode in ('A', 'R')
-    )
+    }
 
 
 def find_large_added_files(filenames, maxkb):
@@ -41,7 +41,7 @@ def find_large_added_files(filenames, maxkb):
     for filename in filenames:
         kb = int(math.ceil(os.stat(filename).st_size / 1024))
         if kb > maxkb:
-            print('{0} ({1} KB) exceeds {2} KB.'.format(filename, kb, maxkb))
+            print('{} ({} KB) exceeds {} KB.'.format(filename, kb, maxkb))
             retv = 1
 
     return retv

pre_commit_hooks/check_ast.py

@@ -22,10 +22,10 @@ def check_ast(argv=None):
         try:
             ast.parse(open(filename, 'rb').read(), filename=filename)
         except SyntaxError:
-            print('{0}: failed parsing with {1}:'.format(
+            print('{}: failed parsing with {}:'.format(
                 filename, interpreter,
             ))
-            print('\n{0}'.format(
+            print('\n{}'.format(
                 '    ' + traceback.format_exc().replace('\n', '\n    ')
             ))
             retval = 1

pre_commit_hooks/check_byte_order_marker.py

@@ -16,7 +16,7 @@ def main(argv=None):
         with open(filename, 'rb') as f:
             if f.read(3) == b'\xef\xbb\xbf':
                 retv = 1
-                print('{0}: Has a byte-order marker'.format(filename))
+                print('{}: Has a byte-order marker'.format(filename))
 
     return retv
 

pre_commit_hooks/check_case_conflict.py

@@ -9,7 +9,7 @@ from pre_commit_hooks.util import cmd_output
 
 
 def lower_set(iterable):
-    return set(x.lower() for x in iterable)
+    return {x.lower() for x in iterable}
 
 
 def find_conflicting_filenames(filenames):
@@ -35,7 +35,7 @@ def find_conflicting_filenames(filenames):
             if x.lower() in conflicts
         ]
         for filename in sorted(conflicting_files):
-            print('Case-insensitivity conflict found: {0}'.format(filename))
+            print('Case-insensitivity conflict found: {}'.format(filename))
         retv = 1
 
     return retv

pre_commit_hooks/check_docstring_first.py

@@ -27,16 +27,16 @@ def check_docstring_first(src, filename='<unknown>'):
         if tok_type == tokenize.STRING and scol == 0:
             if found_docstring_line is not None:
                 print(
-                    '{0}:{1} Multiple module docstrings '
-                    '(first docstring on line {2}).'.format(
+                    '{}:{} Multiple module docstrings '
+                    '(first docstring on line {}).'.format(
                         filename, sline, found_docstring_line,
                     )
                 )
                 return 1
             elif found_code_line is not None:
                 print(
-                    '{0}:{1} Module docstring appears after code '
-                    '(code seen on line {2}).'.format(
+                    '{}:{} Module docstring appears after code '
+                    '(code seen on line {}).'.format(
                         filename, sline, found_code_line,
                     )
                 )

pre_commit_hooks/check_json.py

@@ -16,7 +16,7 @@ def check_json(argv=None):
         try:
             simplejson.load(open(filename))
         except (simplejson.JSONDecodeError, UnicodeDecodeError) as exc:
-            print('{0}: Failed to json decode ({1})'.format(filename, exc))
+            print('{}: Failed to json decode ({})'.format(filename, exc))
             retval = 1
     return retval
 

pre_commit_hooks/check_symlinks.py

@@ -19,7 +19,7 @@ def check_symlinks(argv=None):
                 os.path.islink(filename) and
                 not os.path.exists(filename)
         ):  # pragma: no cover (symlink support required)
-            print('{0}: Broken symlink'.format(filename))
+            print('{}: Broken symlink'.format(filename))
             retv = 1
 
     return retv

pre_commit_hooks/check_xml.py

@@ -19,7 +19,7 @@ def check_xml(argv=None):
             with io.open(filename, 'rb') as xml_file:
                 xml.sax.parse(xml_file, xml.sax.ContentHandler())
         except xml.sax.SAXException as exc:
-            print('{0}: Failed to xml parse ({1})'.format(filename, exc))
+            print('{}: Failed to xml parse ({})'.format(filename, exc))
             retval = 1
     return retval
 

pre_commit_hooks/debug_statement_hook.py

@@ -7,7 +7,7 @@ import collections
 import traceback
 
 
-DEBUG_STATEMENTS = set(['pdb', 'ipdb', 'pudb', 'q', 'rdb'])
+DEBUG_STATEMENTS = {'pdb', 'ipdb', 'pudb', 'q', 'rdb'}
 
 
 DebugStatement = collections.namedtuple(
@@ -37,7 +37,7 @@ def check_file_for_debug_statements(filename):
     try:
         ast_obj = ast.parse(open(filename).read(), filename=filename)
     except SyntaxError:
-        print('{0} - Could not parse ast'.format(filename))
+        print('{} - Could not parse ast'.format(filename))
         print()
         print('\t' + traceback.format_exc().replace('\n', '\n\t'))
         print()
@@ -47,7 +47,7 @@ def check_file_for_debug_statements(filename):
     if visitor.debug_import_statements:
         for debug_statement in visitor.debug_import_statements:
             print(
-                '{0}:{1}:{2} - {3} imported'.format(
+                '{}:{}:{} - {} imported'.format(
                     filename,
                     debug_statement.line,
                     debug_statement.col,

pre_commit_hooks/detect_aws_credentials.py

@@ -95,6 +95,12 @@ def main(argv=None):
             'secret keys from'
         )
     )
+    parser.add_argument(
+        '--allow-missing-credentials',
+        dest='allow_missing_credentials',
+        action='store_true',
+        help='Allow hook to pass when no credentials are detected.'
+    )
     args = parser.parse_args(argv)
 
     credential_files = set(args.credential_files)
@@ -111,6 +117,9 @@ def main(argv=None):
     # the set of keys.
     keys |= get_aws_secrets_from_env()
 
+    if not keys and args.allow_missing_credentials:
+        return 0
+
     if not keys:
         print(
             'No AWS keys were found in the configured credential files and '

pre_commit_hooks/detect_private_key.py

@@ -26,7 +26,7 @@ def detect_private_key(argv=None):
 
     if private_key_files:
         for private_key_file in private_key_files:
-            print('Private key found: {0}'.format(private_key_file))
+            print('Private key found: {}'.format(private_key_file))
         return 1
     else:
         return 0

pre_commit_hooks/end_of_file_fixer.py

@@ -58,7 +58,7 @@ def end_of_file_fixer(argv=None):
         with open(filename, 'rb+') as file_obj:
             ret_for_file = fix_file(file_obj)
             if ret_for_file:
-                print('Fixing {0}'.format(filename))
+                print('Fixing {}'.format(filename))
             retv |= ret_for_file
 
     return retv

pre_commit_hooks/pretty_format_json.py

@@ -25,7 +25,7 @@ def _get_pretty_format(contents, indent, sort_keys=True, top_keys=[]):
 
 
 def _autofix(filename, new_contents):
-    print("Fixing file {0}".format(filename))
+    print("Fixing file {}".format(filename))
     with open(filename, 'w') as f:
         f.write(new_contents)
 
@@ -100,7 +100,7 @@ def pretty_format_json(argv=None):
             )
 
             if contents != pretty_contents:
-                print("File {0} is not pretty-formatted".format(json_file))
+                print("File {} is not pretty-formatted".format(json_file))
 
                 if args.autofix:
                     _autofix(json_file, pretty_contents)
@@ -109,7 +109,7 @@ def pretty_format_json(argv=None):
 
         except simplejson.JSONDecodeError:
             print(
-                "Input File {0} is not a valid JSON, consider using check-json"
+                "Input File {} is not a valid JSON, consider using check-json"
                 .format(json_file)
             )
             return 1

pre_commit_hooks/requirements_txt_fixer.py

@@ -84,7 +84,7 @@ def fix_requirements_txt(argv=None):
             ret_for_file = fix_requirements(file_obj)
 
             if ret_for_file:
-                print('Sorting {0}'.format(arg))
+                print('Sorting {}'.format(arg))
 
             retv |= ret_for_file
 

pre_commit_hooks/string_fixer.py

@@ -69,7 +69,7 @@ def main(argv=None):
     for filename in args.filenames:
         return_value = fix_strings(filename)
         if return_value != 0:
-            print('Fixing strings in {0}'.format(filename))
+            print('Fixing strings in {}'.format(filename))
         retv |= return_value
 
     return retv

pre_commit_hooks/tests_should_end_in_test.py

@@ -16,7 +16,7 @@ def validate_files(argv=None):
     args = parser.parse_args(argv)
 
     retcode = 0
-    test_name_pattern = 'test_.*.py' if args.django else '.*_test.py'
+    test_name_pattern = 'test.*.py' if args.django else '.*_test.py'
     for filename in args.filenames:
         base = basename(filename)
         if (
@@ -26,7 +26,7 @@ def validate_files(argv=None):
         ):
             retcode = 1
             print(
-                '{0} does not match pattern "{1}"'.format(
+                '{} does not match pattern "{}"'.format(
                     filename, test_name_pattern
                 )
             )

pre_commit_hooks/trailing_whitespace_fixer.py

@@ -10,10 +10,14 @@ from pre_commit_hooks.util import cmd_output
 def _fix_file(filename, is_markdown):
     with open(filename, mode='rb') as file_processed:
         lines = file_processed.readlines()
-    lines = [_process_line(line, is_markdown) for line in lines]
-    with open(filename, mode='wb') as file_processed:
-        for line in lines:
-            file_processed.write(line)
+    newlines = [_process_line(line, is_markdown) for line in lines]
+    if newlines != lines:
+        with open(filename, mode='wb') as file_processed:
+            for line in newlines:
+                file_processed.write(line)
+        return True
+    else:
+        return False
 
 
 def _process_line(line, is_markdown):
@@ -55,24 +59,26 @@ def fix_trailing_whitespace(argv=None):
         parser.error('--markdown-linebreak-ext requires a non-empty argument')
     all_markdown = '*' in md_args
     # normalize all extensions; split at ',', lowercase, and force 1 leading '.'
-    md_exts = ['.' + x.lower().lstrip('.')
-               for x in ','.join(md_args).split(',')]
+    md_exts = [
+        '.' + x.lower().lstrip('.') for x in ','.join(md_args).split(',')
+    ]
 
     # reject probable "eaten" filename as extension (skip leading '.' with [1:])
     for ext in md_exts:
         if any(c in ext[1:] for c in r'./\:'):
             parser.error(
-                "bad --markdown-linebreak-ext extension '{0}' (has . / \\ :)\n"
+                "bad --markdown-linebreak-ext extension '{}' (has . / \\ :)\n"
                 "  (probably filename; use '--markdown-linebreak-ext=EXT')"
                 .format(ext)
             )
 
     return_code = 0
     for bad_whitespace_file in bad_whitespace_files:
-        print('Fixing {0}'.format(bad_whitespace_file))
         _, extension = os.path.splitext(bad_whitespace_file.lower())
-        _fix_file(bad_whitespace_file, all_markdown or extension in md_exts)
-        return_code = 1
+        md = all_markdown or extension in md_exts
+        if _fix_file(bad_whitespace_file, md):
+            print('Fixing {}'.format(bad_whitespace_file))
+            return_code = 1
     return return_code