summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-02-28 23:19:52 (GMT)
committerGuido van Rossum <guido@python.org>2002-02-28 23:19:52 (GMT)
commit88b666ca3f2e403d23c05a94fbc8038ad2c1fc4d (patch)
tree1f8e7bf3507922687e18bbc774a6c11e4a1f3e71
parente64ef931d6e4ee800fcd156b28269569d989783c (diff)
downloadcpython-88b666ca3f2e403d23c05a94fbc8038ad2c1fc4d.zip
cpython-88b666ca3f2e403d23c05a94fbc8038ad2c1fc4d.tar.gz
cpython-88b666ca3f2e403d23c05a94fbc8038ad2c1fc4d.tar.bz2
SF patch 518765 (Derek Harland): Bug in copy.py when used through
rexec. When using a restricted environment, imports of copy will fail with an AttributeError when trying to access types.CodeType. Bugfix candidate (all the way back to 1.5.3, but at least 2.1.3 and 2.2.1).
-rw-r--r--Lib/copy.py5
-rw-r--r--Misc/ACKS1
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/copy.py b/Lib/copy.py
index 86fc978..cf0b1af 100644
--- a/Lib/copy.py
+++ b/Lib/copy.py
@@ -197,7 +197,10 @@ try:
d[types.UnicodeType] = _deepcopy_atomic
except AttributeError:
pass
-d[types.CodeType] = _deepcopy_atomic
+try:
+ d[types.CodeType] = _deepcopy_atomic
+except AttributeError:
+ pass
d[types.TypeType] = _deepcopy_atomic
d[types.XRangeType] = _deepcopy_atomic
diff --git a/Misc/ACKS b/Misc/ACKS
index 9a49b86..51780d8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -176,6 +176,7 @@ Milton L. Hankins
Stephen Hansen
Barry Hantman
Lynda Hardman
+Derek Harland
Jason Harper
Gerhard Häring
Larry Hastings