Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Lib/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/test_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ def test_sys_version(self):
("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])
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Remove CVS and Subversion tools: remove svneol.py and treesync.py scripts.
CPython migrated from CVS to Subversion, to Mercurial, and then to Git. CVS
and Subversion are no longer used to develop CPython.
1 change: 0 additions & 1 deletion Misc/README
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,5 @@ README.AIX Information about using Python on AIX
README.coverity Information about running Coverity's Prevent on Python
README.valgrind Information for Valgrind users, see valgrind-python.supp
SpecialBuilds.txt Describes extra symbols you can set for debug builds
svnmap.txt Map of old SVN revs and branches to hg changeset ids
valgrind-python.supp Valgrind suppression file, see README.valgrind
vgrindefs Python configuration for vgrind (a generic pretty printer)
72,546 changes: 0 additions & 72,546 deletions Misc/svnmap.txt

This file was deleted.

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

This file was deleted.

210 changes: 0 additions & 210 deletions Tools/scripts/treesync.py

This file was deleted.