diff options
| author | Guido van Rossum <guido@python.org> | 2007-04-27 23:53:51 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-04-27 23:53:51 +0000 |
| commit | 3bf5ce40cfaf14aa42593b4c4e5c28338c31633a (patch) | |
| tree | a8e25cbdc7fe7a8e9f4ced0f46f91822ea7683fe /command/build_clib.py | |
| parent | 078fadd293abe8b159cb6185a3ded2e87210c5f8 (diff) | |
| download | python-setuptools-git-3bf5ce40cfaf14aa42593b4c4e5c28338c31633a.tar.gz | |
Checkpoint. Manipulated things so that string literals are always
unicode, and a few other compensating changes, e.g. str <- unicode,
chr <- unichr, and repr() of a unicode string no longer starts
with 'u'. Lots of unit tests are broken, but some basic things
work, in particular distutils works so the extensions can be built,
and test_builtin.py works.
Diffstat (limited to 'command/build_clib.py')
| -rw-r--r-- | command/build_clib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/command/build_clib.py b/command/build_clib.py index 07f58179..5434e86c 100644 --- a/command/build_clib.py +++ b/command/build_clib.py @@ -92,7 +92,7 @@ class build_clib (Command): if self.include_dirs is None: self.include_dirs = self.distribution.include_dirs or [] - if type(self.include_dirs) is StringType: + if isinstance(self.include_dirs, basestring): self.include_dirs = self.include_dirs.split(os.pathsep) # XXX same as for build_ext -- what about 'self.define' and @@ -147,7 +147,7 @@ class build_clib (Command): raise DistutilsSetupError, \ "each element of 'libraries' must a 2-tuple" - if type(lib[0]) is not StringType: + if isinstance(lib[0], basestring) StringType: raise DistutilsSetupError, \ "first element of each tuple in 'libraries' " + \ "must be a string (the library name)" |