0
@@ -561,16 +561,17 @@ CONVENIENCE_METHODS['copyWithZone:'] = (
0
     ('__copy__', lambda self: self.copyWithZone_(None)),
0
 )
0
 
0
-NSKeyedArchiver = lookUpClass('NSKeyedArchiver')
0
-NSKeyedUnarchiver = lookUpClass('NSKeyedUnarchiver')
0
-def coder_deepcopy(self):
0
-    buf = NSKeyedArchiver.archivedDataWithRootObject_(self)
0
-    result = NSKeyedUnarchiver.unarchiveObjectWithData_(buf)
0
-    return result
0
-
0
-CONVENIENCE_METHODS['encodeWithCoder:'] = (
0
-    ('__deepcopy__', coder_deepcopy ),
0
-)
0
+# This won't work:
0
+#NSKeyedArchiver = lookUpClass('NSKeyedArchiver')
0
+#NSKeyedUnarchiver = lookUpClass('NSKeyedUnarchiver')
0
+#def coder_deepcopy(self, memo):
0
+#   buf = NSKeyedArchiver.archivedDataWithRootObject_(self)
0
+#   result = NSKeyedUnarchiver.unarchiveObjectWithData_(buf)
0
+#   return result
0
+#
0
+#CONVENIENCE_METHODS['encodeWithCoder:'] = (
0
+#   ('__deepcopy__', coder_deepcopy ),
0
+#)
0
 
0
 CLASS_METHODS['NSNull'] = (
0
     ('__nonzero__',  lambda self: False ),

0
@@ -221,5 +221,22 @@ class TestNSCopying (objc.test.TestCase):
0
         self.assertEquals(o.x, 42)
0
         self.assertEquals(o.intVal(), 40)
0
 
0
+
0
+NSMutableArray = objc.lookUpClass("NSMutableArray")
0
+import copy
0
+
0
+class TestPyCopyObjC (objc.test.TestCase):
0
+    # Testcases that ensure that copy.copy works
0
+    # with Objective-C objects as well.
0
+
0
+    def testCopyArray(self):
0
+        a = NSMutableArray.arrayWithArray_(['a', 'b', 'c'])
0
+        self.assert_(isinstance(a, NSMutableArray))
0
+
0
+        b = copy.copy(a)
0
+        self.assert_(isinstance(b, NSMutableArray))
0
+        self.assert_(list(a) == list(b))
0
+
0
+
0
 if __name__ == "__main__":
0
     objc.test.main()

0
@@ -449,50 +449,56 @@ static PyObject* mapTypes = NULL;
0
 }
0
 
0
 
0
-#if 1
0
--(NSObject*)replacementObjectForArchiver:(NSArchiver*)archiver 
0
+-(id)copyWithZone:(NSZone*)zone
0
 {
0
-	(void)(archiver);
0
-	return self;
0
-}
0
+	if (PyObjC_CopyFunc) {
0
+		PyObjC_BEGIN_WITH_GIL
0
+			PyObject* copy = PyObject_CallFunctionObjArgs(PyObjC_CopyFunc,
0
+					value, NULL);
0
 
0
--(NSObject*)replacementObjectForKeyedArchiver:(NSKeyedArchiver*)archiver
0
-{
0
-	(void)(archiver);
0
-	return self;
0
-}
0
+			if (copy == NULL) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			} 
0
 
0
--(NSObject*)replacementObjectForCoder:(NSKeyedArchiver*)archiver
0
-{
0
-	(void)(archiver);
0
-	return self;
0
-}
0
+			NSObject* result = PyObjC_PythonToId(copy);
0
+			Py_DECREF(copy);
0
 
0
--(NSObject*)replacementObjectForPortCoder:(NSKeyedArchiver*)archiver
0
-{
0
-	(void)(archiver);
0
-	return self;
0
-}
0
+			if (PyErr_Occurred()) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			}
0
 
0
--(Class)classForArchiver
0
-{
0
-	return [OC_PythonArray class];
0
-}
0
+			[result retain];
0
 
0
--(Class)classForKeyedArchiver
0
-{
0
-	return [OC_PythonArray class];
0
-}
0
+			PyObjC_GIL_RETURN(result);
0
 
0
--(Class)classForCoder
0
-{
0
-	return [OC_PythonArray class];
0
+		PyObjC_END_WITH_GIL
0
+	} else {
0
+		return [super copyWithZone:zone];
0
+	}
0
 }
0
 
0
--(Class)classForPortCoder
0
+-(id)mutableCopyWithZone:(NSZone*)zone
0
 {
0
-	return [OC_PythonArray class];
0
-}
0
-#endif
0
+	if (PyObjC_CopyFunc) {
0
+		PyObjC_BEGIN_WITH_GIL
0
+			PyObject* copy = PySequence_List(value);
0
+			if (copy == NULL) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			} 
0
+
0
+			NSObject* result = PyObjC_PythonToId(copy);
0
+			Py_DECREF(copy);
0
 
0
+			if (PyErr_Occurred()) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			}
0
+
0
+			[result retain];
0
+			PyObjC_GIL_RETURN(result);
0
+
0
+		PyObjC_END_WITH_GIL
0
+	} else {
0
+		return [super mutableCopyWithZone:zone];
0
+	}
0
+}
0
 @end /* implementation OC_PythonArray */

0
@@ -523,42 +523,63 @@ static PyObject* mapTypes = NULL;
0
   }
0
 }
0
 
0
+-(id)copyWithZone:(NSZone*)zone
0
+{
0
+	if (PyObjC_CopyFunc) {
0
+		PyObjC_BEGIN_WITH_GIL
0
+			PyObject* copy = PyObject_CallFunctionObjArgs(PyObjC_CopyFunc,
0
+					value, NULL);
0
+			if (copy == NULL) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			} 
0
 
0
-#if 1
0
+			NSObject* result = PyObjC_PythonToId(copy);
0
+			Py_DECREF(copy);
0
 
0
--(NSObject*)replacementObjectForArchiver:(NSArchiver*)archiver
0
-{
0
-	(void)archiver;
0
-	return self;
0
-}
0
+			if (PyErr_Occurred()) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			}
0
 
0
--(NSObject*)replacementObjectForKeyedArchiver:(NSKeyedArchiver*)archiver
0
-{
0
-	(void)archiver;
0
-	return self;
0
-}
0
+			[result retain];
0
 
0
+			PyObjC_GIL_RETURN(result);
0
 
0
--(Class)classForArchiver
0
-{
0
-	return [OC_PythonDictionary class];
0
+		PyObjC_END_WITH_GIL
0
+	} else {
0
+		return [super copyWithZone:zone];
0
+	}
0
 }
0
 
0
--(Class)classForKeyedArchiver
0
+-(id)mutableCopyWithZone:(NSZone*)zone
0
 {
0
-	return [OC_PythonDictionary class];
0
-}
0
+	if (PyObjC_CopyFunc) {
0
+		PyObjC_BEGIN_WITH_GIL
0
+			PyObject* copy = PyDict_New();
0
+			if (copy == NULL) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			} 
0
 
0
--(Class)classForCoder
0
-{
0
-	return [OC_PythonDictionary class];
0
-}
0
+			int r = PyDict_Update(copy, value);
0
+			if (r == -1) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			} 
0
 
0
--(Class)classForPortCoder
0
-{
0
-	return [OC_PythonDictionary class];
0
+			NSObject* result = PyObjC_PythonToId(copy);
0
+			Py_DECREF(copy);
0
+
0
+			if (PyErr_Occurred()) {
0
+				PyObjC_GIL_FORWARD_EXC();
0
+			}
0
+
0
+			[result retain];
0
+
0
+			PyObjC_GIL_RETURN(result);
0
+
0
+		PyObjC_END_WITH_GIL
0
+	} else {
0
+		return [super mutableCopyWithZone:zone];
0
+	}
0
 }
0
 
0
-#endif
0
 
0
 @end  // interface OC_PythonDictionary

0
@@ -399,7 +399,7 @@ end:
0
 
0
   } else {
0
     PyObjC_BEGIN_WITH_GIL
0
-			copy = PyObject_CallFunction(PyObjC_CopyFunc, "O", pyObject);
0
+			copy = PyObject_CallFunctionObjArgs(PyObjC_CopyFunc, pyObject, NULL);
0
       if (copy == NULL) {
0
         PyObjC_GIL_FORWARD_EXC();
0
       }

0
@@ -35,8 +35,14 @@ Version 2.1 (...)
0
 - Objective-C classes that support the ``NSCopying`` protocol can now be
0
   copied using ``copy.copy`` as well.
0
 
0
-- Objective-C classes that support the ``NSCoding`` protocol can now be
0
-  copied using ``copy.deepcopy``.
0
+.. 
0
+   it would be nice to have the following, but that's not easy to achieve::
0
+	- Objective-C classes that support the ``NSCoding`` protocol can now be
0
+	  copied using ``copy.deepcopy``.
0
+
0
+- ``OC_PythonArray`` and ``OC_PythonDictionary`` now explicitly implement
0
+  ``copyWithZone:`` and ``mutableCopyWithZone:``, copies will now be 
0
+  Python objects instead of regular ``NSDictionary`` instances.
0
 
0
 - Pure Python objects now support the ``NSCopying`` protocol.
0