Fix bootstrapping by removing uses of the copy module in distutils
This commit is contained in:
parent
775fd66d7b
commit
f541378d13
|
@ -7,7 +7,6 @@ __revision__ = "$Id$"
|
||||||
|
|
||||||
import sys, os, re
|
import sys, os, re
|
||||||
from types import *
|
from types import *
|
||||||
from copy import copy
|
|
||||||
from distutils.errors import *
|
from distutils.errors import *
|
||||||
from distutils.spawn import spawn
|
from distutils.spawn import spawn
|
||||||
from distutils.file_util import move_file
|
from distutils.file_util import move_file
|
||||||
|
@ -253,7 +252,7 @@ class CCompiler:
|
||||||
any list of standard include directories that the compiler may
|
any list of standard include directories that the compiler may
|
||||||
search by default.
|
search by default.
|
||||||
"""
|
"""
|
||||||
self.include_dirs = copy (dirs)
|
self.include_dirs = dirs[:]
|
||||||
|
|
||||||
|
|
||||||
def add_library (self, libname):
|
def add_library (self, libname):
|
||||||
|
@ -278,7 +277,7 @@ class CCompiler:
|
||||||
not affect any standard system libraries that the linker may
|
not affect any standard system libraries that the linker may
|
||||||
include by default.
|
include by default.
|
||||||
"""
|
"""
|
||||||
self.libraries = copy (libnames)
|
self.libraries = libnames[:]
|
||||||
|
|
||||||
|
|
||||||
def add_library_dir (self, dir):
|
def add_library_dir (self, dir):
|
||||||
|
@ -294,7 +293,7 @@ class CCompiler:
|
||||||
strings). This does not affect any standard library search path
|
strings). This does not affect any standard library search path
|
||||||
that the linker may search by default.
|
that the linker may search by default.
|
||||||
"""
|
"""
|
||||||
self.library_dirs = copy (dirs)
|
self.library_dirs = dirs[:]
|
||||||
|
|
||||||
|
|
||||||
def add_runtime_library_dir (self, dir):
|
def add_runtime_library_dir (self, dir):
|
||||||
|
@ -309,7 +308,7 @@ class CCompiler:
|
||||||
standard search path that the runtime linker may search by
|
standard search path that the runtime linker may search by
|
||||||
default.
|
default.
|
||||||
"""
|
"""
|
||||||
self.runtime_library_dirs = copy (dirs)
|
self.runtime_library_dirs = dirs[:]
|
||||||
|
|
||||||
|
|
||||||
def add_link_object (self, object):
|
def add_link_object (self, object):
|
||||||
|
@ -326,7 +325,7 @@ class CCompiler:
|
||||||
files that the linker may include by default (such as system
|
files that the linker may include by default (such as system
|
||||||
libraries).
|
libraries).
|
||||||
"""
|
"""
|
||||||
self.objects = copy (objects)
|
self.objects = objects[:]
|
||||||
|
|
||||||
|
|
||||||
# -- Private utility methods --------------------------------------
|
# -- Private utility methods --------------------------------------
|
||||||
|
|
|
@ -8,7 +8,6 @@ __revision__ = "$Id$"
|
||||||
|
|
||||||
import sys, os, string, re
|
import sys, os, string, re
|
||||||
from types import *
|
from types import *
|
||||||
from copy import copy
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import warnings
|
import warnings
|
||||||
|
@ -537,7 +536,7 @@ Common commands: (see '--help-commands' for more)
|
||||||
# merge it in with the global negative aliases.
|
# merge it in with the global negative aliases.
|
||||||
negative_opt = self.negative_opt
|
negative_opt = self.negative_opt
|
||||||
if hasattr(cmd_class, '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)
|
negative_opt.update(cmd_class.negative_opt)
|
||||||
|
|
||||||
# Check for help_options in command class. They have a different
|
# Check for help_options in command class. They have a different
|
||||||
|
|
Loading…
Reference in New Issue