diff options
| author | Timothy Edmund Crosley <timothy.crosley@gmail.com> | 2019-03-23 22:53:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 22:53:49 -0700 |
| commit | a760cd4781a6fea6924a53b0b75d84dda3e8caf3 (patch) | |
| tree | 79dee80ba13921898d4e618d8c0905bdc2bc375d | |
| parent | 43f204e74775480667eeb504ef2be649c06791eb (diff) | |
| parent | 136b8d90b397fcbcad4e243b1ea75589bf0c565b (diff) | |
| download | isort-feature/fix-issue-902.tar.gz | |
Merge branch 'master' into feature/fix-issue-902feature/fix-issue-902
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | isort/settings.py | 2 | ||||
| -rw-r--r-- | test_isort.py | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 91faeb47..6a5cba78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ Changelog ========= + ### 4.3.16 - March 23, 2019 - hot fix release -- Fixed issue #909 - skip and skip-glob are not enforced when using settings-path +- Fixed issue #909 - skip and skip-glob are not enforced when using settings-path. - Fixed issue #907 - appdirs optional requirement does not correctly specify version - Fixed issue #902 - Too broad warning about missing toml package +- Fixed issue #778 - remove `user` from known standard library as it's no longer in any supported Python version. ### 4.3.15 - March 10, 2019 - hot fix release - Fixed a regression with handling streaming input from pipes (Issue #895) diff --git a/isort/settings.py b/isort/settings.py index 7324d5fd..bdadc711 100644 --- a/isort/settings.py +++ b/isort/settings.py @@ -117,7 +117,7 @@ default = {'force_to_top': [], 'test', 'textwrap', 'this', 'thread', 'threading', 'time', 'timeit', 'tkinter', 'token', 'tokenize', 'trace', 'traceback', 'tracemalloc', 'ttk', 'tty', 'turtle', 'turtledemo', 'types', 'typing', 'unicodedata', 'unittest', 'urllib', 'urllib2', - 'urlparse', 'user', 'usercustomize', 'uu', 'uuid', 'venv', 'videoreader', + 'urlparse', 'usercustomize', 'uu', 'uuid', 'venv', 'videoreader', 'warnings', 'wave', 'weakref', 'webbrowser', 'whichdb', 'winreg', 'winsound', 'wsgiref', 'xdrlib', 'xml', 'xmlrpc', 'xmlrpclib', 'zipapp', 'zipfile', 'zipimport', 'zlib'], diff --git a/test_isort.py b/test_isort.py index 1e75c17e..c4d3b4e5 100644 --- a/test_isort.py +++ b/test_isort.py @@ -2919,3 +2919,10 @@ def test_settings_path_skip_issue_909(tmpdir): os.chdir(str(test_run_directory)) assert b'skipped 2' in results.lower() + + +def test_standard_library_deprecates_user_issue_778(): + test_input = ('import os\n' + '\n' + 'import user\n') + assert SortImports(file_contents=test_input).output == test_input |