traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
........
This commit is contained in:
Antoine Pitrou 2009-05-15 17:34:21 +00:00
parent 6e61006cc2
commit 56a00deda2
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/distutils/ccompiler.py
View File

@ -6,7 +6,6 @@ for the Distutils compiler abstraction model."""
__revision__ = "$Id$" __revision__ = "$Id$"
import sys, os, re import sys, os, re
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
@ -233,7 +232,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):
"""Add 'libname' to the list of libraries that will be included in """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 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):
"""Add 'dir' to the list of directories that will be searched for """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 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):
"""Add 'dir' to the list of directories that will be searched for """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 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):
"""Add 'object' to the list of object files (or analogues, such as """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 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 --------------------------------------

3
Lib/distutils/dist.py
View File

@ -7,7 +7,6 @@ being built/installed/distributed.
__revision__ = "$Id$" __revision__ = "$Id$"
import sys, os, re import sys, os, re
from copy import copy
try: try:
import warnings import warnings
@ -521,7 +520,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