traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

String method conversion.

This commit is contained in:
Eric S. Raymond 2001-02-09 12:20:51 +00:00
parent 7e642e82d3
commit b3acd3e4d3
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/distutils/cygwinccompiler.py
View File

@ -365,10 +365,10 @@ def check_config_h():
# "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 @@ def check_config_h():
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)

4
Lib/distutils/extension.py
View File

@ -7,7 +7,7 @@ modules in setup scripts."""
__revision__ = "$Id$"
import os, string
import os
from types import *
@ -168,7 +168,7 @@ def read_setup_file (filename):
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"

10
Lib/distutils/version.py
View File

@ -112,12 +112,12 @@ class StrictVersion (Version):
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 @@ class StrictVersion (Version):
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])

6
Lib/plat-irix6/cdplayer.py
View File

@ -25,8 +25,8 @@ class Cdplayer:
t = []
for i in range(2, len(tracklist), 4):
t.append((None, \
(string.atoi(tracklist[i:i+2]), \
string.atoi(tracklist[i+2:i+4]))))
(int(tracklist[i:i+2]), \
int(tracklist[i+2:i+4]))))
tracklist = t
self.track = [None] + [''] * len(tracklist)
self.id = 'd' + string.zfill(len(tracklist), 2)
@ -59,7 +59,7 @@ class Cdplayer:
elif name == 'artist':
self.artist = value
elif name[:5] == 'track':
trackno = string.atoi(name[6:])
trackno = int(name[6:])
self.track[trackno] = value
f.close()

9
Lib/plat-irix6/flp.py
View File

@ -3,7 +3,6 @@
#
# Jack Jansen, December 1991
#
import string
import os
import sys
import FL
@ -248,7 +247,7 @@ def _parse_num(str):
return eval(str)
def _parse_numlist(str):
slist = string.split(str)
slist = str.split()
nlist = []
for i in slist:
nlist.append(_parse_num(i))
@ -277,9 +276,9 @@ def _parse_line(line):
return line
name, value = match.group(1, 2)
if name[0] == 'N':
name = string.join(string.split(name),'')
name = string.lower(name)
name = string.capitalize(name)
name = ''.join(name.split())
name = name.lower()
name = name.capitalize()
try:
pf = _parse_func[name]
except KeyError: