diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-15 17:27:30 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-05-15 17:27:30 (GMT) |
| commit | f541378d13e7750b67758b721e862fd3b27e9e6b (patch) | |
| tree | 15b6288198e26fc15902ed853f024ebff6783a1e /Lib/distutils | |
| parent | 775fd66d7bd74cdedef536ff4f8c134ba718678f (diff) | |
| download | cpython-f541378d13e7750b67758b721e862fd3b27e9e6b.zip cpython-f541378d13e7750b67758b721e862fd3b27e9e6b.tar.gz cpython-f541378d13e7750b67758b721e862fd3b27e9e6b.tar.bz2 | |
Fix bootstrapping by removing uses of the copy module in distutils
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/ccompiler.py | 11 | ||||
| -rw-r--r-- | Lib/distutils/dist.py | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py index a56a038..5a9ff76 100644 --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -7,7 +7,6 @@ __revision__ = "$Id$" import sys, os, re from types import * -from copy import copy from distutils.errors import * from distutils.spawn import spawn from distutils.file_util import move_file @@ -253,7 +252,7 @@ class CCompiler: any list of standard include directories that the compiler may search by default. """ - self.include_dirs = copy (dirs) + self.include_dirs = dirs[:] def add_library (self, libname): @@ -278,7 +277,7 @@ class CCompiler: not affect any standard system libraries that the linker may include by default. """ - self.libraries = copy (libnames) + self.libraries = libnames[:] def add_library_dir (self, dir): @@ -294,7 +293,7 @@ class CCompiler: strings). This does not affect any standard library search path that the linker may search by default. """ - self.library_dirs = copy (dirs) + self.library_dirs = dirs[:] def add_runtime_library_dir (self, dir): @@ -309,7 +308,7 @@ class CCompiler: standard search path that the runtime linker may search by default. """ - self.runtime_library_dirs = copy (dirs) + self.runtime_library_dirs = dirs[:] def add_link_object (self, object): @@ -326,7 +325,7 @@ class CCompiler: files that the linker may include by default (such as system libraries). """ - self.objects = copy (objects) + self.objects = objects[:] # -- Private utility methods -------------------------------------- diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index 2d57ad0..5fe262b 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -8,7 +8,6 @@ __revision__ = "$Id$" import sys, os, string, re from types import * -from copy import copy try: import warnings @@ -537,7 +536,7 @@ Common commands: (see '--help-commands' for more) # merge it in with the global negative aliases. negative_opt = self.negative_opt if hasattr(cmd_class, 'negative_opt'): - negative_opt = copy(negative_opt) + negative_opt = negative_opt.copy() negative_opt.update(cmd_class.negative_opt) # Check for help_options in command class. They have a different |