From 136b8d90b397fcbcad4e243b1ea75589bf0c565b Mon Sep 17 00:00:00 2001 From: Timothy Edmund Crosley Date: Mon, 11 Mar 2019 21:22:42 -0700 Subject: Merge pull request #900 from timothycrosley/feature/fix-issue-778 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix issue #778, deprecating Python3.4 support - starting with removal… --- CHANGELOG.md | 4 +++- isort/settings.py | 2 +- test_isort.py | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d656640d..358e1600 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ 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 #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 336d0b1e..fca84678 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 -- cgit v1.2.1