Merge branch 'release/3.9.5'

Author: timothycrosley

.undertake

@@ -0,0 +1,4 @@
+name=Add isort settings
+color=#3C79AB
+font_color=white
+format=instantly

ACKNOWLEDGEMENTS.md

@@ -38,6 +38,18 @@ Code Contributors
 - Elliott Sales de Andrade (@qulogic)
 - Kasper Jacobsen (@dinoshauer)
 - Sebastian Pipping (@hartwork)
+- Helen Sherwood-Taylor (@helenst)
+- Mocker (@Zuckonit)
+- Tim Graham (@timgraham)
+- Adam (@NorthIsUp)
+
+Documenters
+===================
+- Reinout van Rees (@reinout)
+- Helen Sherwood-Taylor (@helenst)
+- Elliott Sales de Andrade (@QuLogic)
+- Brian Peiris (@brianpeiris)
+- Tim Graham (@timgraham)
 
 --------------------------------------------
 

README.md

@@ -255,7 +255,17 @@ own line
 Note: to change the how constant indents appear - simply change the indent property with the following accepted formats:
 *   Number of spaces you would like. For example: 4 would cause standard 4 space indentation.
 *   Tab
-*   A verbatim string with quotes around it. For example: "    " is equivalent to 4
+*   A verbatim string with quotes around it.
+
+For example:
+
+    "    "
+
+is equivalent to 4
+
+For the import styles that use parentheses, you can control whether or not to
+include a trailing comma after the last import with the include_trailing_comma
+option (defaults to false).
 
 Intelligently Balanced Multi-line Imports
 ======================
@@ -391,6 +401,25 @@ https://gist.github.com/acdha/8717683
 
 Which can help to ensure a certain level of code quality throughout a project.
 
+
+Git hook
+========
+
+isort provides a hook function that can be integrated into your Git pre-commit script to check
+Python code before committing.
+
+To cause the commit to fail if there are isort errors (strict mode), include the following in
+`.git/hooks/pre-commit`:
+
+    from isort.hooks import git_hook
+
+    if __name__ == '__main__':
+        sys.exit(git_hook(strict=True))
+
+If you just want to display warnings, but allow the commit to happen anyway, call git_hook without
+the `strict` parameter.
+
+
 Why isort?
 ======================
 

isort/__init__.py

@@ -25,4 +25,4 @@
 from . import settings
 from .isort import SECTION_NAMES, SECTIONS, SortImports
 
-__version__ = "3.9.4"
+__version__ = "3.9.5"

isort/hooks.py

@@ -0,0 +1,82 @@
+"""isort.py.
+
+Defines a git hook to allow pre-commit warnings and errors about import order.
+
+usage:
+    exit_code = git_hook(strict=True)
+
+Copyright (C) 2015  Helen Sherwood-Taylor
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+"""
+import subprocess
+
+from isort import SortImports
+
+
+def get_output(command):
+    """
+    Run a command and return raw output
+
+    :param str command: the command to run
+    :returns: the stdout output of the command
+    """
+    return subprocess.check_output(command.split())
+
+
+def get_lines(command):
+    """
+    Run a command and return lines of output
+
+    :param str command: the command to run
+    :returns: list of whitespace-stripped lines output by command
+    """
+    stdout = get_output(command)
+    return [line.strip().decode('utf-8') for line in stdout.splitlines()]
+
+
+def git_hook(strict=False):
+    """
+    Git pre-commit hook to check staged files for isort errors
+
+    :param bool strict - if True, return number of errors on exit,
+        causing the hook to fail. If False, return zero so it will
+        just act as a warning.
+
+    :return number of errors if in strict mode, 0 otherwise.
+    """
+
+    # Get list of files modified and staged
+    diff_cmd = "git diff-index --cached --name-only --diff-filter=ACMRTUXB HEAD"
+    files_modified = get_lines(diff_cmd)
+
+    errors = 0
+    for filename in files_modified:
+        if filename.endswith('.py'):
+            # Get the staged contents of the file
+            staged_cmd = "git show :%s" % filename
+            staged_contents = get_output(staged_cmd)
+
+            sort = SortImports(
+                file_path=filename,
+                file_contents=staged_contents.decode(),
+                check=True
+            )
+
+            if sort.incorrectly_sorted:
+                errors += 1
+
+    return errors if strict else 0