changeset:   87682:c4715c9f442f
parent:      87679:84148898a606
parent:      87681:c6bb6f304f75
user:        Alexandre Vassalotti <alexandre@peadrop.com>
date:        Sun Dec 01 13:26:32 2013 -0800
files:       Lib/copy.py Misc/NEWS
description:
Issue #11480: Merge with 3.3.


diff -r 84148898a606 -r c4715c9f442f Lib/copy.py
--- a/Lib/copy.py	Sun Dec 01 14:30:47 2013 +0100
+++ b/Lib/copy.py	Sun Dec 01 13:26:32 2013 -0800
@@ -76,6 +76,14 @@
     if copier:
         return copier(x)
 
+    try:
+        issc = issubclass(cls, type)
+    except TypeError: # cls is not a class
+        issc = False
+    if issc:
+        # treat it as a regular class:
+        return _copy_immutable(x)
+
     copier = getattr(cls, "__copy__", None)
     if copier:
         return copier(x)
diff -r 84148898a606 -r c4715c9f442f Lib/test/test_copy.py
--- a/Lib/test/test_copy.py	Sun Dec 01 14:30:47 2013 +0100
+++ b/Lib/test/test_copy.py	Sun Dec 01 13:26:32 2013 -0800
@@ -3,6 +3,7 @@
 import copy
 import copyreg
 import weakref
+import abc
 from operator import le, lt, ge, gt, eq, ne
 
 import unittest
@@ -93,9 +94,11 @@
             pass
         def f():
             pass
+        class WithMetaclass(metaclass=abc.ABCMeta):
+            pass
         tests = [None, 42, 2**100, 3.14, True, False, 1j,
                  "hello", "hello\u1234", f.__code__,
-                 NewStyle, range(10), Classic, max]
+                 NewStyle, range(10), Classic, max, WithMetaclass]
         for x in tests:
             self.assertIs(copy.copy(x), x)
 
diff -r 84148898a606 -r c4715c9f442f Misc/NEWS
--- a/Misc/NEWS	Sun Dec 01 14:30:47 2013 +0100
+++ b/Misc/NEWS	Sun Dec 01 13:26:32 2013 -0800
@@ -33,6 +33,9 @@
 - Fixed _pickle.Unpickler to not fail when loading empty strings as
   persistent IDs.
 
+- Issue #11480: Fixed copy.copy to work with classes with custom metaclasses.
+  Patch by Daniel Urban.
+
 - Issue #6477: Added support for pickling the types of built-in singletons
   (i.e., Ellipsis, NotImplemented, None).