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
........

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index cad663a348e2442fb1e689afd36d3b4c75fa5ae8..875f96fac39366a66e719f36ba87645c9b0331bc 100644 (file)
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -6,7 +6,6 @@ for the Distutils compiler abstraction model."""
 __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 @@ 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):
         """Add 'libname' to the list of libraries that will be included in
@@ -257,7 +256,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):
         """Add 'dir' to the list of directories that will be searched for
@@ -272,7 +271,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):
         """Add 'dir' to the list of directories that will be searched for
@@ -286,7 +285,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):
         """Add 'object' to the list of object files (or analogues, such as
@@ -302,7 +301,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 7c30e8856f8177a825e2d8184451efa0a6e5a27c..91adc4d37f25388cae5bd7500d2206ed9d226058 100644 (file)
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -7,7 +7,6 @@ being built/installed/distributed.
 __revision__ = "$Id$"
 
 import sys, os, re
-from copy import copy
 
 try:
     import warnings
@@ -521,7 +520,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