summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-04 20:37:16 +0200
committerÉric Araujo <merwok@netwok.org>2011-06-04 20:37:16 +0200
commitb4ef8f299f9e50c872026eac00243f75fcf24aa2 (patch)
treea47ccbf471a394cc83f6b415ef9d0f1793841f13 /Lib
parent4dfcb1a00dbcbc76fcd152d652d3f83b53b14e45 (diff)
parent823759e7672b95ced55b9d5a757faab47bdb5c2c (diff)
downloadcpython-git-b4ef8f299f9e50c872026eac00243f75fcf24aa2.tar.gz
Branch merge
Diffstat (limited to 'Lib')
-rw-r--r--Lib/packaging/compiler/cygwinccompiler.py7
-rw-r--r--Lib/packaging/run.py3
-rw-r--r--Lib/packaging/util.py3
3 files changed, 5 insertions, 8 deletions
diff --git a/Lib/packaging/compiler/cygwinccompiler.py b/Lib/packaging/compiler/cygwinccompiler.py
index 7bfa611ea5..348dbe782f 100644
--- a/Lib/packaging/compiler/cygwinccompiler.py
+++ b/Lib/packaging/compiler/cygwinccompiler.py
@@ -48,7 +48,6 @@ of GCC (same as cygwin in no-cygwin mode).
import os
import sys
-import copy
from packaging import logger
from packaging.compiler.unixccompiler import UnixCCompiler
@@ -172,9 +171,9 @@ class CygwinCCompiler(UnixCCompiler):
extra_postargs=None, build_temp=None, target_lang=None):
"""Link the objects."""
# use separate copies, so we can modify the lists
- extra_preargs = copy.copy(extra_preargs or [])
- libraries = copy.copy(libraries or [])
- objects = copy.copy(objects or [])
+ extra_preargs = list(extra_preargs or [])
+ libraries = list(libraries or [])
+ objects = list(objects or [])
# Additional libraries
libraries.extend(self.dll_libraries)
diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py
index de9dd13fe9..1895dde4cc 100644
--- a/Lib/packaging/run.py
+++ b/Lib/packaging/run.py
@@ -5,7 +5,6 @@ import re
import sys
import getopt
import logging
-from copy import copy
from packaging import logger
from packaging.dist import Distribution
@@ -673,7 +672,7 @@ class Dispatcher:
def main(args=None):
old_level = logger.level
- old_handlers = copy(logger.handlers)
+ old_handlers = list(logger.handlers)
try:
dispatcher = Dispatcher(args)
if dispatcher.action is None:
diff --git a/Lib/packaging/util.py b/Lib/packaging/util.py
index 4e5bd2c202..748686d2eb 100644
--- a/Lib/packaging/util.py
+++ b/Lib/packaging/util.py
@@ -14,7 +14,6 @@ import zipfile
import posixpath
import sysconfig
import subprocess
-from copy import copy
from glob import iglob as std_iglob
from fnmatch import fnmatchcase
from inspect import getsource
@@ -384,7 +383,7 @@ byte_compile(files, optimize=%r, force=%r,
elif optimize == 2:
cmd.insert(1, "-OO")
- env = copy(os.environ)
+ env = os.environ.copy()
env['PYTHONPATH'] = os.path.pathsep.join(sys.path)
try:
spawn(cmd, env=env)