mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
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.
This commit is contained in:
parent
d4617f24ca
commit
572dbf8f13
28 changed files with 68 additions and 81 deletions
|
@ -16,7 +16,7 @@ the "typical" Unix-style command-line C compiler:
|
|||
__revision__ = "$Id$"
|
||||
|
||||
import os, sys
|
||||
from types import StringType, NoneType
|
||||
from types import NoneType
|
||||
from copy import copy
|
||||
|
||||
from distutils import sysconfig
|
||||
|
@ -212,7 +212,7 @@ class UnixCCompiler(CCompiler):
|
|||
|
||||
lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs,
|
||||
libraries)
|
||||
if type(output_dir) not in (StringType, NoneType):
|
||||
if not isinstance(output_dir, (basestring, NoneType)):
|
||||
raise TypeError, "'output_dir' must be a string or None"
|
||||
if output_dir is not None:
|
||||
output_filename = os.path.join(output_dir, output_filename)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue