Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PyCQA/isort
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.3.7
Choose a base ref
...
head repository: PyCQA/isort
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.3.8
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Feb 25, 2019

  1. Copy the full SHA
    bfabca6 View commit details
Showing with 11 additions and 2 deletions.
  1. +3 −0 CHANGELOG.md
  2. +1 −1 isort/__init__.py
  3. +6 −0 isort/main.py
  4. +1 −1 setup.py
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Changelog
=========
### 4.3.8 - Feburary 25, 2019 - hot fix release
- Fixed a bug that led to the recursive option not always been available from the command line.

### 4.3.7 - February 25, 2019 - hot fix release
- Expands the finder failsafe to occur on the creation of the finder objects.

2 changes: 1 addition & 1 deletion isort/__init__.py
Original file line number Diff line number Diff line change
@@ -25,4 +25,4 @@
from . import settings # noqa: F401
from .isort import SortImports # noqa: F401

__version__ = "4.3.7"
__version__ = "4.3.8"
6 changes: 6 additions & 0 deletions isort/main.py
Original file line number Diff line number Diff line change
@@ -251,6 +251,7 @@ def parse_args(argv=None):
help='Force sortImports to recognize a module as being part of the current python project.')
parser.add_argument('-q', '--quiet', action='store_true', dest="quiet",
help='Shows extra quiet output, only errors are outputted.')
parser.add_argument('-r', dest='ambiguous_r_flag', action='store_true')
parser.add_argument('-rm', '--remove-import', dest='remove_imports', action='append',
help='Removes the specified import from all files.')
parser.add_argument('-rc', '--recursive', dest='recursive', action='store_true',
@@ -306,6 +307,11 @@ def main(argv=None):
print(INTRO)
return

if arguments.get('ambiguous_r_flag'):
print('ERROR: Deprecated -r flag set. This flag has been replaced with -rm to remove ambiguity between it and '
'-rc for recursive')
sys.exit(1)

if 'settings_path' in arguments:
sp = arguments['settings_path']
arguments['settings_path'] = os.path.abspath(sp) if os.path.isdir(sp) else os.path.dirname(os.path.abspath(sp))
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
readme = f.read()

setup(name='isort',
version='4.3.7',
version='4.3.8',
description='A Python utility / library to sort Python imports.',
long_description=readme,
author='Timothy Crosley',