diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-28 21:29:32 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-28 21:29:32 (GMT) |
commit | fe2d5babba5d26de2093b6518316b268488187be (patch) | |
tree | 0167f6e4c8e7965d2b0f95a94e0fbc2e7ac58bb2 /Lib | |
parent | a4a3020abc065d40f57069d6c69d02222ddc85d6 (diff) | |
download | cpython-fe2d5babba5d26de2093b6518316b268488187be.zip cpython-fe2d5babba5d26de2093b6518316b268488187be.tar.gz cpython-fe2d5babba5d26de2093b6518316b268488187be.tar.bz2 |
bpo-32159: Remove tools for CVS and Subversion (#4615)
CPython migrated from CVS to Subversion, to Mercurial, and then to
Git. CVS and Subversion are not more used to develop CPython.
* platform module: drop support for sys.subversion. The
sys.subversion attribute has been removed in Python 3.3.
* Remove Misc/svnmap.txt
* Remove Tools/scripts/svneol.py
* Remove Tools/scripts/treesync.py
Diffstat (limited to 'Lib')
-rwxr-xr-x | Lib/platform.py | 7 | ||||
-rw-r--r-- | Lib/test/test_platform.py | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index cc2db98..dc981ec 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1202,9 +1202,6 @@ def _sys_version(sys_version=None): _, branch, revision = sys._git elif hasattr(sys, '_mercurial'): _, branch, revision = sys._mercurial - elif hasattr(sys, 'subversion'): - # sys.subversion was added in Python 2.5 - _, branch, revision = sys.subversion else: branch = '' revision = '' @@ -1259,7 +1256,7 @@ def python_branch(): """ Returns a string identifying the Python implementation branch. - For CPython this is the Subversion branch from which the + For CPython this is the SCM branch from which the Python binary was built. If not available, an empty string is returned. @@ -1273,7 +1270,7 @@ def python_revision(): """ Returns a string identifying the Python implementation revision. - For CPython this is the Subversion revision from which the + For CPython this is the SCM revision from which the Python binary was built. If not available, an empty string is returned. diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py index ea6752b..2cf4d3f 100644 --- a/Lib/test/test_platform.py +++ b/Lib/test/test_platform.py @@ -145,14 +145,14 @@ class PlatformTest(unittest.TestCase): ("PyPy", "2.5.2", "trunk", "63378", ('63378', 'Mar 26 2009'), "") } - for (version_tag, subversion, sys_platform), info in \ + for (version_tag, scm, sys_platform), info in \ sys_versions.items(): sys.version = version_tag - if subversion is None: + if scm is None: if hasattr(sys, "_git"): del sys._git else: - sys._git = subversion + sys._git = scm if sys_platform is not None: sys.platform = sys_platform self.assertEqual(platform.python_implementation(), info[0]) |