Commits

Ronald Oussoren  committed e93c8ba Merge

merge

  • Participants
  • Parent commits f1d1145, 0d0db62

Comments (0)

Files changed (4)

File pyobjc-core/NEWS.txt

 Version 2.4.1
 -------------
 
+- Cocoa wrappers: fix metadata for ``copy``, ``mutableCopy``, 
+  ``copyWithZone:`` and ``mutableCopyWithZone:``
+
 - Fix for issue 3585235 on SourceForge: the threading helper category on
   NSObject didn't work due to a typo (defined in the Cocoa bindings)
 

File pyobjc-framework-Cocoa/Doc/NEWS.txt

   Fix is based on a patch by "Kentzo" with further updates and tests by
   Ronald.
 
+* Fix metadata for ``copyWithZone:``, ``copy``, ``mutableCopyWithZone:``
+  and ``mutableCopy``.
+
 Version 2.4
 -----------
 

File pyobjc-framework-Cocoa/Lib/Foundation/_metadata.py

 # This file is generated by objective.metadata
 #
-# Last update: Tue Oct  2 21:31:30 2012
+# Last update: Wed Nov 14 10:54:38 2012
 
 import objc, sys
 
     r(b'NSObject', b'classForKeyedArchiver', {'retval': {'type': '#'}})
     r(b'NSObject', b'classForKeyedUnarchiver', {'retval': {'type': '#'}})
     r(b'NSObject', b'classForPortCoder', {'retval': {'type': '#'}})
-    r(b'NSObject', b'commitEditingAndReturnError:', {'arguments': {2: {'typestr': 'o^@'}}})
+    r(b'NSObject', b'commitEditingAndReturnError:', {'arguments': {2: {'type': 'o'}}})
     r(b'NSObject', b'conformsToProtocol:', {'retval': {'type': 'Z'}})
     r(b'NSObject', b'conformsToProtocol:', {'retval': {'type': 'Z'}})
     r(b'NSObject', b'connection:canAuthenticateAgainstProtectionSpace:', {'retval': {'type': b'Z'}})
     r(b'NSObject', b'connectionDidFinishLoading:', {'retval': {'type': 'v'}})
     r(b'NSObject', b'connectionShouldUseCredentialStorage:', {'retval': {'type': b'Z'}})
     r(b'NSObject', b'continueWithoutCredentialForAuthenticationChallenge:', {'retval': {'type': 'v'}})
-    r(b'NSObject', b'copyWithZone:', {'arguments': {2: {'type': '^{_NSZone=}'}}})
-    r(b'NSObject', b'copyWithZone:', {'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'copy', {'retval': {'already_retained': True}})
+    r(b'NSObject', b'copyWithZone:', {'retval': {'already_retained': True}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'copyWithZone:', {'retval': {'already_retained': True}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
     r(b'NSObject', b'countByEnumeratingWithState:objects:count:', {'arguments': {2: {'type': sel32or64(b'^{?=L^@^L[5L]}', b'^{?=Q^@^Q[5Q]}')}, 3: {'type': '^@'}}, 'suggestion': 'use python iteration'})
     r(b'NSObject', b'didChange:valuesAtIndexes:forKey:', {'retval': {'type': 'v'}, 'arguments': {2: {'type': 'I'}}})
     r(b'NSObject', b'didChangeValueForKey:', {'retval': {'type': 'v'}})
     r(b'NSObject', b'makeNewConnection:sender:', {'retval': {'type': 'Z'}})
     r(b'NSObject', b'methodForSelector:', {'retval': {'type': '^?'}, 'arguments': {2: {'type': ':'}}})
     r(b'NSObject', b'methodSignatureForSelector:', {'arguments': {2: {'type': ':'}}})
-    r(b'NSObject', b'mutableCopyWithZone:', {'retval': {'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
-    r(b'NSObject', b'mutableCopyWithZone:', {'retval': {'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'mutableCopy', {'retval': {'already_retained': True, 'type': '@'}})
+    r(b'NSObject', b'mutableCopyWithZone:', {'retval': {'already_retained': True, 'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'mutableCopyWithZone:', {'retval': {'already_retained': True, 'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
     r(b'NSObject', b'netService:didNotPublish:', {'retval': {'type': 'v'}})
     r(b'NSObject', b'netService:didNotResolve:', {'retval': {'type': 'v'}})
     r(b'NSObject', b'netService:didUpdateTXTRecordData:', {'retval': {'type': 'v'}})
     r(b'NSObject', b'connectionDidResumeDownloading:totalBytesWritten:expectedTotalBytes:', {'required': False, 'retval': {'type': b'v'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'q'}, 4: {'type': b'q'}}})
     r(b'NSObject', b'connectionShouldUseCredentialStorage:', {'required': False, 'retval': {'type': b'Z'}, 'arguments': {2: {'type': b'@'}}})
     r(b'NSObject', b'continueWithoutCredentialForAuthenticationChallenge:', {'required': True, 'retval': {'type': 'v'}, 'arguments': {2: {'type': b'@'}}})
-    r(b'NSObject', b'copyWithZone:', {'required': True, 'retval': {'type': b'@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'copyWithZone:', {'required': True, 'retval': {'already_retained': True, 'type': b'@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
     r(b'NSObject', b'countByEnumeratingWithState:objects:count:', {'required': True, 'retval': {'type': sel32or64(b'I', b'Q')}, 'arguments': {2: {'type': sel32or64(b'^{?=L^@^L[5L]}', b'^{?=Q^@^Q[5Q]}')}, 3: {'type': '^@'}, 4: {'type': sel32or64(b'I', b'Q')}}, 'suggestion': 'use python iteration'})
     r(b'NSObject', b'createConversationForConnection:', {'required': False, 'retval': {'type': b'@'}, 'arguments': {2: {'type': b'@'}}})
     r(b'NSObject', b'debugDescription', {'required': False, 'retval': {'type': b'@'}})
     r(b'NSObject', b'makeNewConnection:sender:', {'required': False, 'retval': {'type': 'Z'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}}})
     r(b'NSObject', b'metadataQuery:replacementObjectForResultObject:', {'required': False, 'retval': {'type': b'@'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}}})
     r(b'NSObject', b'metadataQuery:replacementValueForAttribute:value:', {'required': False, 'retval': {'type': b'@'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}, 4: {'type': b'@'}}})
-    r(b'NSObject', b'mutableCopyWithZone:', {'required': True, 'retval': {'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
+    r(b'NSObject', b'mutableCopyWithZone:', {'required': True, 'retval': {'already_retained': True, 'type': '@'}, 'arguments': {2: {'type': '^{_NSZone=}'}}})
     r(b'NSObject', b'netService:didNotPublish:', {'required': False, 'retval': {'type': 'v'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}}})
     r(b'NSObject', b'netService:didNotResolve:', {'required': False, 'retval': {'type': 'v'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}}})
     r(b'NSObject', b'netService:didUpdateTXTRecordData:', {'required': False, 'retval': {'type': 'v'}, 'arguments': {2: {'type': b'@'}, 3: {'type': b'@'}}})

File pyobjc-framework-Cocoa/metadata/Foundation.fwinfo

-# objectiv.metada exceptions file, see its document
+# objective.metada exceptions file, see its document
 # for information on how to update this file.
 {
  "definitions": {
         "type_override": "^{_NSZone=}"
        }
       }, 
+      "retval": {
+        "already_retained": true
+      },
       "class_method": true, 
       "selector": "copyWithZone:"
      }, 
       }, 
       "class_method": true, 
       "retval": {
-       "type_override": "@"
+       "type_override": "@",
+       "already_retained": true
       }, 
       "selector": "mutableCopyWithZone:"
      }, 
       }, 
       "class_method": false, 
       "retval": {
-       "type_override": "@"
+       "type_override": "@",
+       "already_retained": true
       }, 
       "selector": "mutableCopyWithZone:"
      }, 
      {
       "class_method": false, 
       "retval": {
+       "type_override": "@",
+       "already_retained": true
+      }, 
+      "selector": "mutableCopy"
+     }, 
+     {
+      "class_method": false, 
+      "retval": {
        "type_override": "v"
       }, 
       "selector": "URL:resourceDataDidBecomeAvailable:"
         "type_override": "^{_NSZone=}"
        }
       }, 
+      "retval": {
+        "already_retained": true
+      },
       "class_method": false, 
       "selector": "copyWithZone:"
      }, 
      {
+      "retval": {
+        "already_retained": true
+      },
+      "class_method": false, 
+      "selector": "copy"
+     }, 
+     {
       "args": {
        "0": {
         "type_override": "I"
         "type_override": "^{_NSZone=}"
        }
       }, 
+      "retval": {
+        "already_retained": true
+      },
       "class_method": false, 
       "selector": "copyWithZone:"
      }
       }, 
       "class_method": false, 
       "retval": {
-       "type_override": "@"
+       "type_override": "@",
+       "already_retained": true
       }, 
       "selector": "mutableCopyWithZone:"
      }