René's URL Explorer Experiment

Title: Remove Python 2 compatibility shims by Harmon758 · Pull Request #979 · gitpython-developers/GitPython · GitHub

Open Graph Title: Remove Python 2 compatibility shims by Harmon758 · Pull Request #979 · gitpython-developers/GitPython

X Title: Remove Python 2 compatibility shims by Harmon758 · Pull Request #979 · gitpython-developers/GitPython

Description: 3.0.0 was supposed to have removed Python 2 support, but didn't actually remove any of the compatibility shims for Python 2. In fact, with 3b13c11 (#860), further shims were added for Python 2 and going so far as to add future as a dependency and check for Python <= 2.3 (when sys.getfilesystemencoding was added). I'm not sure why #860 was merged with those shims, especially since it was failing a test due to switching to Unicode strings in Python 2, but this commit that did so improperly merged requirements.txt as well, readding gitdb and ddt as dependencies when they had been removed with ce21f63 (#826), so that setup.py could use requirements.txt. gitdb itself had actually already been removed as a dependency over 2 years before requirements.txt was updated, with 2ca7c01 in v2.0.9. The commit was then reverted with cc664f0, referencing failing Travis CI tests due to future having been added as a dependency in requirements.txt and the Travis CI configuration installing dependencies from test-requirements.txt, rather than requirements.txt and/or setup.py. The changes were then reintroduced with 74a0507, adding installation of requirements.txt (despite what the commit summary says) to the Travis CI configuration. It was then again reverted with c9dbaab, referencing the failing Travis CI build for the previous commit due to the same failing test for the PR. Afterwards, for some reason, the changes were yet again reintroduced with dac619e, the very commit that dropped Python 2 support. This time, future wasn't even added to requirements.txt, so Python 2 would have failed to import the library even if the commit hadn't dropped support for it. The changes were again reverted with 913d806 (for the 3rd time) when Python 2 support was brought back after being dropped in a patch version. They were then introduced again (for the 4th time) with 2e7e82b and 3.0.0 was subsequently released with the readded dependencies from almost 3 years ago, leading to #908. #908 was closed with ca080bb in 3.0.1, only removing gitdb as a dependency, leading to #911. #911 was then merged with df5c941 and released as 3.0.2, resolving the dependency issues caused by the improper merge, but leaving the pointless and broken compatibility shims that caused this mess in place. This PR removes those and other compatibility shims for Python 2 and old Python 3 versions: Remove from builtins import str - This was never even in any release that supported Python 2 and no release ever included future as a dependency. Remove check for the existence of sys.getfilesystemencoding - It has existed since Python 2.3 as mentioned earlier. Remove and replace compat._unichr with chr, comapt.bchr with bytes([...]), compat.binary_type with bytes, compat.bytes_chr with bytes((...,)), compat.FileType with io.IOBase, compat.izip with zip, compat.MAXSIZE with sys.maxsize, compat.mviter with .values(), compat.string_types with str, compat.text_type with str, compat.unicode with str, compat.xrange with range, compat.UnicodeMixin subclass by using __str__ rather than __unicode__ Remove compat.byte_ord, compat.PY3, compat.range Remove surrogateescape error handler for Python 2 Remove Python 2 checks for compat.defenc, TestFun.test_tree_entries_from_data_with_failing_name_decode_py3, TestIndex.test_add_utf8P_path Remove Python 2 checks in Git.__unpack_args, compat.with_metaclass, Diff.__str__, TestRepo.test_untracked_files, Actor._main_actor Remove Python 3 checks in GitConfigParser._read, _octal_repl, run_commit_hook, git.objects.tree, RefLogEntry.__repr__, Repo._get_untracked_files, TestGit.test_call_unpack_args_unicode, TestGit.test_call_unpack_args Remove TestFun.test_tree_entries_from_data_with_failing_name_decode_py2 Python 2 test Remove attempt to import ConfigParser for Python 2 in git.config Remove Python 2.7 check in TestBase Remove check for logging.NullHandler for Python 2.6 in git.util Remove Python < 3.3 check for PermissionError in git.cmd This PR also fixes the formatting of the version specifier in requirements.txt (so as not to be in parentheses as #826 changed it to be with ce21f63) and improves setup.py's python_requires so as to succinctly specify >=3.4.

Open Graph Description: 3.0.0 was supposed to have removed Python 2 support, but didn't actually remove any of the compatibility shims for Python 2. In fact, with 3b13c11 (#860), further shims were added for Python 2 ...

X Description: 3.0.0 was supposed to have removed Python 2 support, but didn&#39;t actually remove any of the compatibility shims for Python 2. In fact, with 3b13c11 (#860), further shims were added for Pytho...

Opengraph URL: https://github.com/gitpython-developers/GitPython/pull/979

X: @github

direct link

Domain: github.com

Links:

Viewport: width=device-width