diff options
| author | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 +0000 |
| commit | b56a8f9ed0bfc43878362c0d08e7292b146f9b81 (patch) | |
| tree | b3ddc92407f49d2847de6685b7a975394553e7d1 /unixccompiler.py | |
| parent | 846a6d17bc1356201efb984e23caafff578982f4 (diff) | |
| download | python-setuptools-git-b56a8f9ed0bfc43878362c0d08e7292b146f9b81.tar.gz | |
Merged revisions 55795-55816 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
........
r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
........
r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
........
Diffstat (limited to 'unixccompiler.py')
| -rw-r--r-- | unixccompiler.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/unixccompiler.py b/unixccompiler.py index a42ab5ed..d07ae1e3 100644 --- a/unixccompiler.py +++ b/unixccompiler.py @@ -16,7 +16,6 @@ the "typical" Unix-style command-line C compiler: __revision__ = "$Id$" import os, sys -from types import NoneType from copy import copy from distutils import sysconfig @@ -212,7 +211,7 @@ class UnixCCompiler(CCompiler): lib_opts = gen_lib_options(self, library_dirs, runtime_library_dirs, libraries) - if not isinstance(output_dir, (basestring, NoneType)): + if not isinstance(output_dir, (basestring, type(None))): 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) |