mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Patch# 1258 by Christian Heimes: kill basestring.

Browse source 
I like this because it makes the code shorter! :-)
This commit is contained in:
Guido van Rossum 2007-10-16 18:12:55 +00:00
parent 60d241f135
commit 3172c5d263
77 changed files with 171 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/distutils/command/build_clib.py
View file

@ -86,7 +86,7 @@ class build_clib(Command):
if self.include_dirs is None:
self.include_dirs = self.distribution.include_dirs or []
if isinstance(self.include_dirs, basestring):
if isinstance(self.include_dirs, str):
self.include_dirs = self.include_dirs.split(os.pathsep)
# XXX same as for build_ext -- what about 'self.define' and
@ -134,7 +134,7 @@ class build_clib(Command):
raise DistutilsSetupError(
"each element of 'libraries' must a 2-tuple")
if isinstance(lib[0], basestring):
if isinstance(lib[0], str):
raise DistutilsSetupError(
"first element of each tuple in 'libraries' "
"must be a string (the library name)")

10
Lib/distutils/command/build_ext.py
View file

@ -133,7 +133,7 @@ class build_ext(Command):
plat_py_include = sysconfig.get_python_inc(plat_specific=1)
if self.include_dirs is None:
self.include_dirs = self.distribution.include_dirs or []
if isinstance(self.include_dirs, basestring):
if isinstance(self.include_dirs, str):
self.include_dirs = self.include_dirs.split(os.pathsep)
# Put the Python "system" include dir at the end, so that
@ -142,7 +142,7 @@ class build_ext(Command):
if plat_py_include != py_include:
self.include_dirs.append(plat_py_include)
if isinstance(self.libraries, basestring):
if isinstance(self.libraries, str):
self.libraries = [self.libraries]
# Life is easier if we're not forever checking for None, so
@ -151,12 +151,12 @@ class build_ext(Command):
self.libraries = []
if self.library_dirs is None:
self.library_dirs = []
elif isinstance(self.library_dirs, basestring):
elif isinstance(self.library_dirs, str):
self.library_dirs = self.library_dirs.split(os.pathsep)
if self.rpath is None:
self.rpath = []
elif isinstance(self.rpath, basestring):
elif isinstance(self.rpath, str):
self.rpath = self.rpath.split(os.pathsep)
# for extensions under windows use different directories
@ -309,7 +309,7 @@ class build_ext(Command):
"each element of 'ext_modules' option must be an "
"Extension instance or 2-tuple")
if not (isinstance(ext_name, basestring) and
if not (isinstance(ext_name, str) and
extension_name_re.match(ext_name)):
raise DistutilsSetupError(
"first element of each tuple in 'ext_modules' "

2
Lib/distutils/command/build_py.py
View file

@ -325,7 +325,7 @@ class build_py (Command):
return outputs
def build_module(self, module, module_file, package):
if isinstance(package, basestring):
if isinstance(package, str):
package = package.split('.')
elif not isinstance(package, (list, tuple)):
raise TypeError(

8
Lib/distutils/command/config.py
View file

@ -69,17 +69,17 @@ class config(Command):
def finalize_options(self):
if self.include_dirs is None:
self.include_dirs = self.distribution.include_dirs or []
elif isinstance(self.include_dirs, basestring):
elif isinstance(self.include_dirs, str):
self.include_dirs = self.include_dirs.split(os.pathsep)
if self.libraries is None:
self.libraries = []
elif isinstance(self.libraries, basestring):
elif isinstance(self.libraries, str):
self.libraries = [self.libraries]
if self.library_dirs is None:
self.library_dirs = []
elif isinstance(self.library_dirs, basestring):
elif isinstance(self.library_dirs, str):
self.library_dirs = self.library_dirs.split(os.pathsep)
def run(self):
@ -204,7 +204,7 @@ class config(Command):
self._check_compiler()
(src, out) = self._preprocess(body, headers, include_dirs, lang)
if isinstance(pattern, basestring):
if isinstance(pattern, str):
pattern = re.compile(pattern)
file = open(out)

2
Lib/distutils/command/install.py
View file

@ -449,7 +449,7 @@ class install (Command):
self.extra_path = self.distribution.extra_path
if self.extra_path is not None:
if isinstance(self.extra_path, basestring):
if isinstance(self.extra_path, str):
self.extra_path = self.extra_path.split(',')
if len(self.extra_path) == 1:

2
Lib/distutils/command/install_data.py
View file

@ -45,7 +45,7 @@ class install_data(Command):
def run(self):
self.mkpath(self.install_dir)
for f in self.data_files:
if isinstance(f, basestring):
if isinstance(f, str):
# it's a simple file, so copy it
f = convert_path(f)
if self.warn_dir: