commit b3acd3e4d338ef41d50b86e9230646c510bb5c6a
author Eric S. Raymond <esr@thyrsus.com> Fri Feb 09 12:20:51 2001 +0000
committer Eric S. Raymond <esr@thyrsus.com> Fri Feb 09 12:20:51 2001 +0000
tree 8b68e9d058cfd6d8eb218956cb194bbcb8beb523
parent 7e642e82d3429d9b4f583ba0e81a27e5ea02d5ca

String method conversion.

Lib/distutils/cygwinccompiler.py

diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
index f40d1a2..42318ad 100644
--- a/Lib/distutils/cygwinccompiler.py
+++ b/Lib/distutils/cygwinccompiler.py
@@ -365,10 +365,10 @@
     # "config.h" check -- should probably be renamed...
 
     from distutils import sysconfig
-    import string,sys
+    import sys
     # if sys.version contains GCC then python was compiled with
     # GCC, and the config.h file should be OK
-    if string.find(sys.version,"GCC") >= 0:
+    if sys.version.find("GCC") >= 0:
         return (CONFIG_H_OK, "sys.version mentions 'GCC'")
     
     fn = sysconfig.get_config_h_filename()
@@ -387,7 +387,7 @@
 
     else:
         # "config.h" contains an "#ifdef __GNUC__" or something similar
-        if string.find(s,"__GNUC__") >= 0:
+        if s.find("__GNUC__") >= 0:
             return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
         else:
             return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn)

Lib/distutils/extension.py

diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py
index a63ede2..f49abad 100644
--- a/Lib/distutils/extension.py
+++ b/Lib/distutils/extension.py
@@ -7,7 +7,7 @@
 
 __revision__ = "$Id$"
 
-import os, string
+import os
 from types import *
 
 
@@ -168,7 +168,7 @@
             elif switch == "-I":
                 ext.include_dirs.append(value)
             elif switch == "-D":
-                equals = string.find(value, "=")
+                equals = value.find("=")
                 if equals == -1:        # bare "-DFOO" -- no value
                     ext.define_macros.append((value, None))
                 else:                   # "-DFOO=blah"

Lib/distutils/version.py

diff --git a/Lib/distutils/version.py b/Lib/distutils/version.py
index 9d3d172..2916eb7 100644
--- a/Lib/distutils/version.py
+++ b/Lib/distutils/version.py
@@ -112,12 +112,12 @@
             match.group(1, 2, 4, 5, 6)
 
         if patch:
-            self.version = tuple(map(string.atoi, [major, minor, patch]))
+            self.version = tuple(map(int, [major, minor, patch]))
         else:
-            self.version = tuple(map(string.atoi, [major, minor]) + [0])
+            self.version = tuple(map(int, [major, minor]) + [0])
 
         if prerelease:
-            self.prerelease = (prerelease[0], string.atoi(prerelease_num))
+            self.prerelease = (prerelease[0], int(prerelease_num))
         else:
             self.prerelease = None
 
@@ -125,9 +125,9 @@
     def __str__ (self):
         
         if self.version[2] == 0:
-            vstring = string.join(map(str, self.version[0:2]), '.')
+            vstring = '.'.join(map(str, self.version[0:2]))
         else:
-            vstring = string.join(map(str, self.version), '.')
+            vstring = '.'.join(map(str, self.version))
 
         if self.prerelease:
             vstring = vstring + self.prerelease[0] + str(self.prerelease[1])