From 56a00deda295ec8432ade7b1b9de383af854a8da Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 15 May 2009 17:34:21 +0000 Subject: [PATCH] Merged revisions 72671 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72671 | antoine.pitrou | 2009-05-15 19:27:30 +0200 (ven., 15 mai 2009) | 3 lines Fix bootstrapping by removing uses of the copy module in distutils ........ --- Lib/distutils/ccompiler.py | 11 +++++------ 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 cad663a348e..875f96fac39 100644 --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -6,7 +6,6 @@ __revision__ = "$Id$" import sys, os, re -from copy import copy from distutils.errors import * from distutils.spawn import spawn from distutils.file_util import move_file @@ -233,7 +232,7 @@ def set_include_dirs(self, dirs): 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): """Add 'libname' to the list of libraries that will be included in @@ -257,7 +256,7 @@ def set_libraries(self, libnames): 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): """Add 'dir' to the list of directories that will be searched for @@ -272,7 +271,7 @@ def set_library_dirs(self, dirs): 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): """Add 'dir' to the list of directories that will be searched for @@ -286,7 +285,7 @@ def set_runtime_library_dirs(self, dirs): 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): """Add 'object' to the list of object files (or analogues, such as @@ -302,7 +301,7 @@ def set_link_objects(self, objects): 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 7c30e8856f8..91adc4d37f2 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -7,7 +7,6 @@ __revision__ = "$Id$" import sys, os, re -from copy import copy try: import warnings @@ -521,7 +520,7 @@ def _parse_command_opts (self, parser, args): # 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