[Python-checkins] r72672 - in python/branches/py3k: Lib/distutils/ccompiler.py Lib/distutils/dist.py
antoine.pitrou
python-checkins at python.org
Fri May 15 19:34:21 CEST 2009
Author: antoine.pitrou
Date: Fri May 15 19:34:21 2009
New Revision: 72672
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/ccompiler.py
python/branches/py3k/Lib/distutils/dist.py
Modified: python/branches/py3k/Lib/distutils/ccompiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/ccompiler.py (original)
+++ python/branches/py3k/Lib/distutils/ccompiler.py Fri May 15 19:34:21 2009
@@ -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 @@
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 @@
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 @@
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 @@
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 @@
files that the linker may include by default (such as system
libraries).
"""
- self.objects = copy(objects)
+ self.objects = objects[:]
# -- Private utility methods --------------------------------------
Modified: python/branches/py3k/Lib/distutils/dist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/dist.py (original)
+++ python/branches/py3k/Lib/distutils/dist.py Fri May 15 19:34:21 2009
@@ -7,7 +7,6 @@
__revision__ = "$Id$"
import sys, os, re
-from copy import copy
try:
import warnings
@@ -521,7 +520,7 @@
# 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
More information about the Python-checkins
mailing list