mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-08 18:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Back out conversion to string methods; the Distutils is intended to work

Browse source 
with 1.5.2
This commit is contained in:
Andrew M. Kuchling 2001-03-22 03:48:31 +00:00
parent a7f225d88a
commit ac20f773f3
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/cmd.py
View file

@ -9,7 +9,7 @@ in the distutils.command package.
__revision__ = "$Id$" __revision__ = "$Id$"
import sys, os, re import sys, os, string, re
from types import * from types import *
from distutils.errors import * from distutils.errors import *
from distutils import util, dir_util, file_util, archive_util, dep_util from distutils import util, dir_util, file_util, archive_util, dep_util
@ -161,7 +161,7 @@ class Command:
print indent + header print indent + header
indent = indent + " " indent = indent + " "
for (option, _, _) in self.user_options: for (option, _, _) in self.user_options:
option = option.translate(longopt_xlate) option = string.translate(option, longopt_xlate)
if option[-1] == "=": if option[-1] == "=":
option = option[:-1] option = option[:-1]
value = getattr(self, option) value = getattr(self, option)
@ -421,7 +421,7 @@ class Command:
""" """
if exec_msg is None: if exec_msg is None:
exec_msg = "generating %s from %s" % \ exec_msg = "generating %s from %s" % \
(outfile, ', '.join(infiles)) (outfile, string.join(infiles, ', '))
if skip_msg is None: if skip_msg is None:
skip_msg = "skipping %s (inputs unchanged)" % outfile skip_msg = "skipping %s (inputs unchanged)" % outfile

6
Lib/distutils/cygwinccompiler.py
View file

@ -365,10 +365,10 @@ def check_config_h():
# "config.h" check -- should probably be renamed... # "config.h" check -- should probably be renamed...
from distutils import sysconfig from distutils import sysconfig
import sys import string,sys
# if sys.version contains GCC then python was compiled with # if sys.version contains GCC then python was compiled with
# GCC, and the config.h file should be OK # GCC, and the config.h file should be OK
if sys.version.find("GCC") >= 0: if string.find(sys.version,"GCC") >= 0:
return (CONFIG_H_OK, "sys.version mentions 'GCC'") return (CONFIG_H_OK, "sys.version mentions 'GCC'")
fn = sysconfig.get_config_h_filename() fn = sysconfig.get_config_h_filename()
@ -387,7 +387,7 @@ def check_config_h():
else: else:
# "config.h" contains an "#ifdef __GNUC__" or something similar # "config.h" contains an "#ifdef __GNUC__" or something similar
if s.find("__GNUC__") >= 0: if string.find(s,"__GNUC__") >= 0:
return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn) return (CONFIG_H_OK, "'%s' mentions '__GNUC__'" % fn)
else: else:
return (CONFIG_H_NOTOK, "'%s' does not mention '__GNUC__'" % fn) 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$" __revision__ = "$Id$"
import os import os, string
from types import * from types import *
@ -168,7 +168,7 @@ def read_setup_file (filename):
elif switch == "-I": elif switch == "-I":
ext.include_dirs.append(value) ext.include_dirs.append(value)
elif switch == "-D": elif switch == "-D":
equals = value.find("=") equals = string.find(value, "=")
if equals == -1: # bare "-DFOO" -- no value if equals == -1: # bare "-DFOO" -- no value
ext.define_macros.append((value, None)) ext.define_macros.append((value, None))
else: # "-DFOO=blah" else: # "-DFOO=blah"

10
Lib/distutils/version.py
View file

@ -112,12 +112,12 @@ class StrictVersion (Version):
match.group(1, 2, 4, 5, 6) match.group(1, 2, 4, 5, 6)
if patch: if patch:
self.version = tuple(map(int, [major, minor, patch])) self.version = tuple(map(string.atoi, [major, minor, patch]))
else: else:
self.version = tuple(map(int, [major, minor]) + [0]) self.version = tuple(map(string.atoi, [major, minor]) + [0])
if prerelease: if prerelease:
self.prerelease = (prerelease[0], int(prerelease_num)) self.prerelease = (prerelease[0], string.atoi(prerelease_num))
else: else:
self.prerelease = None self.prerelease = None
@ -125,9 +125,9 @@ class StrictVersion (Version):
def __str__ (self): def __str__ (self):
if self.version[2] == 0: if self.version[2] == 0:
vstring = '.'.join(map(str, self.version[0:2])) vstring = string.join(map(str, self.version[0:2]), '.')
else: else:
vstring = '.'.join(map(str, self.version)) vstring = string.join(map(str, self.version), '.')
if self.prerelease: if self.prerelease:
vstring = vstring + self.prerelease[0] + str(self.prerelease[1]) vstring = vstring + self.prerelease[0] + str(self.prerelease[1])