Fix bootstrapping by removing uses of the copy module in distutils

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index a56a03880e89ab99c681d65f4e9ebacf8d3fa0a0..5a9ff76d678518cb98be4fb4bce91a769e090a02 100644 (file)
--- 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 2d57ad09e911b08b589d0162d0e8c2701a886408..5fe262b1122f5bf47e4014e68dfa40940c135d15 100644 (file)
--- 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