X Tutup
Skip to content

Commit fe2d5ba

Browse files
vstinnervstinner
authored
bpo-32159: Remove tools for CVS and Subversion (python#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
1 parent a4a3020 commit fe2d5ba

File tree

8 files changed

+8
-72881
lines changed

8 files changed

+8
-72881
lines changed

‎Lib/platform.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,9 +1202,6 @@ def _sys_version(sys_version=None):
12021202
_, branch, revision = sys._git
12031203
elif hasattr(sys, '_mercurial'):
12041204
_, branch, revision = sys._mercurial
1205-
elif hasattr(sys, 'subversion'):
1206-
# sys.subversion was added in Python 2.5
1207-
_, branch, revision = sys.subversion
12081205
else:
12091206
branch = ''
12101207
revision = ''
@@ -1259,7 +1256,7 @@ def python_branch():
12591256
""" Returns a string identifying the Python implementation
12601257
branch.
12611258
1262-
For CPython this is the Subversion branch from which the
1259+
For CPython this is the SCM branch from which the
12631260
Python binary was built.
12641261
12651262
If not available, an empty string is returned.
@@ -1273,7 +1270,7 @@ def python_revision():
12731270
""" Returns a string identifying the Python implementation
12741271
revision.
12751272
1276-
For CPython this is the Subversion revision from which the
1273+
For CPython this is the SCM revision from which the
12771274
Python binary was built.
12781275
12791276
If not available, an empty string is returned.

‎Lib/test/test_platform.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ def test_sys_version(self):
145145
("PyPy", "2.5.2", "trunk", "63378", ('63378', 'Mar 26 2009'),
146146
"")
147147
}
148-
for (version_tag, subversion, sys_platform), info in \
148+
for (version_tag, scm, sys_platform), info in \
149149
sys_versions.items():
150150
sys.version = version_tag
151-
if subversion is None:
151+
if scm is None:
152152
if hasattr(sys, "_git"):
153153
del sys._git
154154
else:
155-
sys._git = subversion
155+
sys._git = scm
156156
if sys_platform is not None:
157157
sys.platform = sys_platform
158158
self.assertEqual(platform.python_implementation(), info[0])

‎Misc/NEWS.d/next/Tools-Demos/2017-11-28-21-24-41.bpo-32159.RSl4QK.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Remove CVS and Subversion tools: remove svneol.py and treesync.py scripts.
2+
CPython migrated from CVS to Subversion, to Mercurial, and then to Git. CVS
3+
and Subversion are no longer used to develop CPython.

‎Misc/README‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ README.AIX Information about using Python on AIX
2222
README.coverity Information about running Coverity's Prevent on Python
2323
README.valgrind Information for Valgrind users, see valgrind-python.supp
2424
SpecialBuilds.txt Describes extra symbols you can set for debug builds
25-
svnmap.txt Map of old SVN revs and branches to hg changeset ids
2625
valgrind-python.supp Valgrind suppression file, see README.valgrind
2726
vgrindefs Python configuration for vgrind (a generic pretty printer)

‎Misc/svnmap.txt‎

Lines changed: 0 additions & 72546 deletions
This file was deleted.

‎Tools/scripts/README‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ rgrep.py Reverse grep through a file (useful for big logfiles)
6161
run_tests.py Run the test suite with more sensible default options
6262
serve.py Small wsgiref-based web server, used in make serve in Doc
6363
suff.py Sort a list of files by suffix
64-
svneol.py Set svn:eol-style on all files in directory
6564
texi2html.py Convert GNU texinfo files into HTML
66-
treesync.py Synchronize source trees (very idiosyncratic)
6765
untabify.py Replace tabs with spaces in argument files
6866
which.py Find a program in $PATH
6967
win_add2path.py Add Python to the search path on Windows

‎Tools/scripts/svneol.py‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎Tools/scripts/treesync.py‎

Lines changed: 0 additions & 210 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup