Apply diff2.txt from SF patch http://www.python.org/sf/572113
(with one small bugfix in bgen/bgen/scantools.py)
This replaces string module functions with string methods
for the stuff in the Tools directory. Several uses of
string.letters etc. are still remaining.
diff --git a/Tools/versioncheck/checkversions.py b/Tools/versioncheck/checkversions.py
index 2420611..dcc56d3 100644
--- a/Tools/versioncheck/checkversions.py
+++ b/Tools/versioncheck/checkversions.py
@@ -5,7 +5,6 @@
import os
import getopt
import sys
-import string
import pyversioncheck
CHECKNAME="_checkversion.py"
@@ -43,7 +42,7 @@
sys.exit(1)
for o, a in options:
if o == '-v':
- VERBOSE = string.atoi(a)
+ VERBOSE = int(a)
if not arguments:
arguments = [sys.prefix]
for dir in arguments:
diff --git a/Tools/versioncheck/pyversioncheck.py b/Tools/versioncheck/pyversioncheck.py
index b6e50d3..51bdd68 100644
--- a/Tools/versioncheck/pyversioncheck.py
+++ b/Tools/versioncheck/pyversioncheck.py
@@ -3,7 +3,6 @@
import rfc822
import urllib
import sys
-import string
# Verbose options
VERBOSE_SILENT=0 # Single-line reports per package
@@ -60,8 +59,8 @@
if verbose >= VERBOSE_EACHFILE:
print ' No "Current-Version:" header in URL or URL not found'
return -1, None, None
- version = string.strip(string.lower(version))
- newversion = string.strip(string.lower(newversion))
+ version = version.lower().strip()
+ newversion = newversion.lower().strip()
if version == newversion:
if verbose >= VERBOSE_EACHFILE:
print ' Version identical (%s)'%newversion