summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Edmund Crosley <timothy.crosley@gmail.com>2015-02-11 20:43:03 -0500
committerTimothy Edmund Crosley <timothy.crosley@gmail.com>2015-02-11 20:43:03 -0500
commitb25d6a36bcbefb149495358ef89d648b4ef9656f (patch)
tree08cc39d4a0cbd34dae563ca50e2cb32b673bd940
parente9898c585d63c7217044d672fc483ddde83c6ac0 (diff)
parent21061e54dfac993a2c93a8d7d7aeacb0f405857c (diff)
downloadisort-b25d6a36bcbefb149495358ef89d648b4ef9656f.tar.gz
Merge pull request #251 from brutasse/fix/combine-as-switch
Add command-line switch for combining as imports
-rwxr-xr-xisort/main.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/isort/main.py b/isort/main.py
index a73ad329..54d4f677 100755
--- a/isort/main.py
+++ b/isort/main.py
@@ -99,6 +99,8 @@ def main():
help="Ensures the output doesn't save if the resulting file contains syntax errors.")
parser.add_argument('-cs', '--combine-star', dest='combine_star', action='store_true',
help="Ensures that if a star import is present, nothing else is imported from that namespace.")
+ parser.add_argument('-ca', '--combine-as', dest='combine_as_imports', action='store_true',
+ help="Combines as imports on the same line.")
parser.add_argument('-tc', '--trailing-comma', dest='trailing_comma', action='store_true',
help='Includes a trailing comma on multi line imports that include parentheses.')
parser.add_argument('-v', '--version', action='version', version='isort {0}'.format(__version__))