Commits

Ronald Oussoren  committed fe9bf19

- Introduces objc._pyobjc_bool, a python boolean type (the type of
objc.YES and objc.NO). On Python 2.3 this is an alias for __builtin__.bool.
With this type is is possible to create NSNumber instances representing
boolean values from Python on Python 2.2.
- Renames the public names in ObjCPointer.m, alloc_hack.m, class-builder.m,
objc-object.m and objc-class.m to coding-style compliant names.
- Simular updates in pyobjc-api.[hm].
- Updates other code to deal with the changes above.

  • Participants
  • Parent commits c0c8f21

Comments (0)

Files changed (47)

File pyobjc/Lib/AppKit/__init__.py

             None, 
             selector='accessibilityActionDescription:',
             signature='@@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityActionNames',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityAtributeNames',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityAttributeValue:',
             signature='@@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityFocusedUIElement',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityHitTest:',
             signature='@@:{_NSPoint=ff}',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityIsAttributeSettable',
             signature='c@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityIsIgnored',
             signature='c@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilityPerformAction:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='accessibilitySetValue:ForAttribute:',
             signature='@@:@@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='changeSpelling:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='currentMode',
             signature='i@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='provideNewView:',
             signature='@@:c',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='setColor:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='supportsMode:',
             signature='c@:i',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='alphaControlAddedOrRemoved:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='attachColorList:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='detachColorList:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='initWithPickerMask:colorPanel:',
             signature='@@:i@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='insertNewButtonImage:in:',
             signature='@@:@@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='provideNewButtonImage',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='setMode:',
             signature='v@:i',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='viewSizeChanged:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='comboBoxCell:completedString:',
             signature='@@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='comboBoxCell:indexOfItemWithStringValue:',
             signature='I@:@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='comboBoxCell:objectValueForItemAtIndex:',
             signature='@@:@i',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='numberOfItemsInComboBoxCell:',
             signature='i@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='comboBox:completedString:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='comboBox:indexOfItemWithStringValue:',
             signature='I@:@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='comboBox:objectValueForItemAtIndex:',
             signature='@@:@i',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='numberOfItemsInComboBox:',
             signature='i@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='concludeDragOperation:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='draggingEnded:',
             signature='v@:@',
-            required=0 # Not implemented yet (10.2)
+            isRequired=0 # Not implemented yet (10.2)
         ),
         _objc.selector(
             None, 
             selector='draggingEntered:',
             signature='i@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='draggingExited:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='draggingUpdated:',
             signature='i@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='performDragOperation:',
             signature='c@:@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='prepareForDragOperation:',
             signature='c@:@',
-            required=0
+            isRequired=0
         ),
     ]
 )
             None, 
             selector='draggedImage',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggedImageLocation',
             signature='{_NSPoint=ff}@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingDestinationWindow',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingLocation',
             signature='{_NSPoint=ff}@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingPasteboard',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingSequenceNumber',
             signature='i@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingSource',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingSourceOperationMask',
             signature='i@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='namesOfPromisedFilesDroppedAtDestination:',
             signature='@@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='slideDraggedImageTo:',
             signature='v@:{_NSPoint=ff}',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='draggedImage:beganAt:',
             signature='v@:@{_NSPoint=ff}',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggedImage:endedAt:deposited:',
             signature='v@:@{_NSPoint=ff}c',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggedImage:endedAt:operation:',
             signature='v@:@{_NSPoint=ff}i',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggedImage:movedTo:',
             signature='v@:@{_NSPoint=ff}',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='draggingSourceOperationMaskForLocal:',
             signature='I@:c',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='ignoreModifierKeysWhileDragging',
             signature='c@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='namesOfPromisedFilesDroppedAtDestination:',
             signature='@@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='ignoreSpelling:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='mouseDownOnCharacterIndex:atCoordinate:withModifier:client:',
             signature='c@:I{_NSPoint=ff}I@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='mouseDraggedOnCharacterIndex:atCoordinate:withModifier:client:',
             signature='c@:I{_NSPoint=ff}I@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='mouseUpOnCharacterIndex:atCoordinate:withModifier:client:',
             signature='c@:I{_NSPoint=ff}I@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='validateMenuItem:',
             signature='c@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='awakeFromNib',
             signature='v@:',
-            required=1
+            isRequired=1
         ),
     ]
 )
     None,
     selector='outlineView:willDisplayCell:forTableColumn:item:',
     signature='v@:@@@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item;
     None,
     selector='outlineView:shouldEditTableColumn:item:',
     signature='c@:@@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)selectionShouldChangeInOutlineView:(NSOutlineView *)outlineView;
     None,
     selector='selectionShouldChangeInOutlineView:',
     signature='c@:@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item;
     None,
     selector='outlineView:shouldSelectItem:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectTableColumn:(NSTableColumn *)tableColumn;
     None,
     selector='outlineView:shouldSelectTableColumn:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # // NSOutlineView specific
     None,
     selector='outlineView:shouldExpandItem:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)outlineView:(NSOutlineView *)outlineView shouldCollapseItem:(id)item;
     None,
     selector='outlineView:shouldCollapseItem:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (void)outlineView:(NSOutlineView *)outlineView willDisplayOutlineCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item;
     None,
     selector='outlineView:willDisplayOutlineCell:forTableColumn:item:',
     signature='v@:@@@@',
-    required=0
+    isRequired=0
     )
     ]
     )
             None, 
             selector='outlineView:acceptDrop:item:childIndex:',
             signature='c@@@i',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='outlineView:child:ofItem:',
             signature='@@:@i@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='outlineView:isItemExpandable:',
             signature='c@:@@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='outlineView:itemForPersistentObject:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='outlineView:numberOfChildrenOfItem:',
             signature='i@:@@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='outlineView:objectValueForTableColumn:byItem:',
             signature='@@:@@@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='outlineView:persistentObjectForItem:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='outlineView:setObjectValue:forTableColumn:byItem:',
             signature='v@:@@@@',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='outlineView:validateDrop:proposedItem:proposedChildIndex:',
             signature='i@:@@@i',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='outlineView:writeItems:toPasteBoard:',
             signature='c@:@@@',
-            required=0
+            isRequired=0
         ),
     ]
 )
             None, 
             selector='readSelectionFromPasteboard:',
             signature='c@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='writeSelectionToPasteboard:types:',
             signature='c@:@@',
-            required=1
+            isRequired=1
         ),
     ]
 )
     None,
     selector='tableView:willDisplayCell:forTableColumn:row:',
     signature='v@:@@@i',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)tableView:(NSTableView *)tableView shouldEditTableColumn:(NSTableColumn *)tableColumn row:(int)row;
     None,
     selector='tableView:shouldEditTableColumn:row:',
     signature='c@:@@i',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)selectionShouldChangeInTableView:(NSTableView *)aTableView;
     None,
     selector='selectionShouldChangeInTableView:',
     signature='c@:@',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(int)row;
     None,
     selector='tableView:shouldSelectRow:',
     signature='c@:@i',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)tableView:(NSTableView *)tableView shouldSelectTableColumn:(NSTableColumn *)tableColumn;
     None,
     selector='tableView:shouldSelectTableColumn:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 #- (void) tableView:(NSTableView*)tableView mouseDownInHeaderOfTableColumn:(NSTableColumn *)tableColumn;
     None,
     selector='tableView:mouseDownInHeaderOfTableColumn:',
     signature='v@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (void) tableView:(NSTableView*)tableView didClickTableColumn:(NSTableColumn *)tableColumn;
     None,
     selector='tableView:didClickTableColumn:',
     signature='v@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (void) tableView:(NSTableView*)tableView didDragTableColumn:(NSTableColumn *)tableColumn;
     None,
     selector='tableView:didDragTableColumn:',
     signature='v@:@@',
-    required=0
+    isRequired=0
     )
     ]
     )
             None, 
             selector='numberOfRowsInTableView:',
             signature='i@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='tableView:acceptDrop:row:dropOperation:',
             signature='c@:@@ii',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='tableView:objectValueForTableColumn:row:',
             signature='@@:@@i',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='tableView:setObjectValue:forTableColumn:row:',
             signature='@@:@@@i',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='tableView:validateDrop:proposedRow:proposedDropOperation:',
             signature='i@:@@ii',
-            required=0
+            isRequired=0
         ),
         _objc.selector(
             None, 
             selector='tableView:writeRows:toPasteboard:',
             signature='c@:@@@',
-            required=0
+            isRequired=0
         ),
     ]
 )        
             None, 
             selector='attachment',
             signature='@@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='cellBaselineOffset',
             signature='{_NSPoint=ff}@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='cellFrameforTextContainer:proposedLineFragment:glyphPosition:characterIndex:',
             signature='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}{_NSPoint=ff}I',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='cellSize',
             signature='{_NSSize=ff}@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='drawWithFrame:inView:',
             signature='v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='drawWithFrame:inView:characterIndex:',
             signature='v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@I',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='drawWithFrame:inView:characterIndex:layoutManager:',
             signature='v@:{_NSRect={_NSPoint=ff}{_NSSize=ff}}@I@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='highlight:withFrame:inView:',
             signature='v@:c{_NSRect={_NSPoint=ff}{_NSSize=ff}}@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='setAttachment:',
             signature='v@:@',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='trackMouse:inRect:ofView:untilMouseUp:',
             signature='c@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@c',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='trackMouse:inRect:ofView:atCharacterIndex:untilMouseUp:',
             signature='c@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@Ic',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='wantsToTrackMouse',
             signature='c@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='wantsToTrackMouseForEvent:inRect:ofView:atCharacterIndex:',
             signature='c@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@I',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='view:stringForToolTip:point:userData:',
             signature='@@:@i{_NSPoint=ff}i^v',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='validateToolbarItem:',
             signature='c@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
     None,
     selector='toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:',
     signature='@@:@@c',
-    required=1
+    isRequired=1
     ),
     _objc.selector(
     None,
     selector='toolbarDefaultItemIdentifiers:',
     signature='@@:@',
-    required=1
+    isRequired=1
     ),
     _objc.selector(
     None,
     selector='toolbarAllowedItemIdentifiers:',
     signature='@@:@',
-    required=1
+    isRequired=1
     ),
 
     ### The following are really notifications.  However, they are
     None,
     selector='toolbarWillAddItem:',
     signature='v@:@',
-    required=0
+    isRequired=0
     ),
     _objc.selector(
     None,
     selector='toolbarDidRemoveItem:',
     signature='v@:@',
-    required=0
+    isRequired=0
     ),
     ]
     )
             None, 
             selector='validateUserInterfaceItem:',
             signature='c@:@',
-            required=1
+            isRequired=1
         ),
     ]
 )
             None, 
             selector='action',
             signature=':@:',
-            required=1
+            isRequired=1
         ),
         _objc.selector(
             None, 
             selector='tag',
             signature='i@:',
-            required=1
+            isRequired=1
         ),
     ]
 )
     None,
     selector='applicationShouldTerminate:',
     signature='i@:@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename;
     None,
     selector='application:openFile:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)application:(NSApplication *)sender openTempFile:(NSString *)filename;
     None,
     selector='application:openTempFile:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender;
     None,
     selector='applicationShouldOpenUntitledFile:',
     signature='c@:@',
-    required=0
+    isRequired=0
     ),
     
 # - (BOOL)applicationOpenUntitledFile:(NSApplication *)sender;
     None,
     selector='applicationOpenUntitledFile:',
     signature='c@:@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)application:(id)sender openFileWithoutUI:(NSString *)filename;
     None,
     selector='application:openFileWithoutUI:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)application:(NSApplication *)sender printFile:(NSString *)filename;
     None,
     selector='application:printFile:',
     signature='c@:@@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
     None,
     selector='applicationShouldTerminateAfterLastWindowClosed:',
     signature='c@:@',
-    required=0
+    isRequired=0
     ),
 
 # - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag;
     None,
     selector='applicationShouldHandleReopen:hasVisibleWindows:',
     signature='c@:@c',
-    required=0
+    isRequired=0
     ),
 
 # - (NSMenu *)applicationDockMenu:(NSApplication *)sender;
     None,
     selector='applicationDockMenu:',
     signature='@@:@',
-    required=0
+    isRequired=0
     ),
     ]
 )

File pyobjc/Lib/Foundation/__init__.py

             None, 
             selector='makeNewConnection:sender:',
             signature='c@:@@',
-            required=0
+            isRequired=0
         ),
 # - (BOOL)connection:(NSConnection *)ancestor shouldMakeNewConnection:(NSConnection *)conn;
         _objc.selector(
             None, 
             selector='connection:shouldMakeNewConnection:',
             signature='c@:@@',
-            required=0
+            isRequired=0
         ),
 # - (NSData *)authenticationDataForComponents:(NSArray *)components;
         _objc.selector(
             None, 
             selector='authenticationDataForComponents:',
             signature='@@:@',
-            required=0
+            isRequired=0
         ),
 # - (BOOL)authenticateComponents:(NSArray *)components withData:(NSData *)signature;
         _objc.selector(
             None, 
             selector='authenticateComponents:withData:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
 # - (id)createConversationForConnection:(NSConnection *)conn;
         _objc.selector(
             None, 
             selector='createConversationForConnection:',
             signature='@@:@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='connection:handleRequest:',
             signature='c@:@@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='fileManager:shouldProceedAfterError:',
             signature='c@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)fileManager:(NSFileManager *)fm willProcessPath:(NSString *)path;
         _objc.selector(
             None, 
             selector='replacementObjectForArchiver:',
             signature='v@:@@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='archiver:willEncodeObject:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)archiver:(NSKeyedArchiver *)archiver didEncodeObject:(id)object;
         _objc.selector(
             None, 
             selector='archiver:didEncodeObject:',
             signature='v@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)archiver:(NSKeyedArchiver *)archiver willReplaceObject:(id)object withObject:(id)newObject;
         _objc.selector(
             None, 
             selector='archiver:willReplaceObject:willReplaceObject:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (void)archiverWillFinish:(NSKeyedArchiver *)archiver;
         _objc.selector(
             None, 
             selector='archiverWillFinish:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)archiverDidFinish:(NSKeyedArchiver *)archiver;
         _objc.selector(
             None, 
             selector='archiverDidFinish:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='unarchiver:cannotDecodeObjectOfClassName:originalClasses:',
             signature='#@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (id)unarchiver:(NSKeyedUnarchiver *)unarchiver didDecodeObject:(id)object;
         _objc.selector(
             None, 
             selector='unarchiver:didDecodeObject:',
             signature='@@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)unarchiver:(NSKeyedUnarchiver *)unarchiver willReplaceObject:(id)object withObject:(id)newObject;
         _objc.selector(
             None, 
             selector='unarchiver:willReplaceObject:withObject:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (void)unarchiverWillFinish:(NSKeyedUnarchiver *)unarchiver;
         _objc.selector(
             None, 
             selector='unarchiverWillFinish:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)unarchiverDidFinish:(NSKeyedUnarchiver *)unarchiver;
         _objc.selector(
             None, 
             selector='unarchiverDidFinish:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='netServiceWillPublish:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceWillResolve:(NSNetService *)sender;
         _objc.selector(
             None, 
             selector='netServiceWillResolve:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)netService:(NSNetService *)sender didNotPublish:(NSDictionary *)errorDict;
         _objc.selector(
             None, 
             selector='netService:didNotPublish:',
             signature='v@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceDidResolveAddress:(NSNetService *)sender;
         _objc.selector(
             None, 
             selector='netServiceDidResolveAddress:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict;
         _objc.selector(
             None, 
             selector='netService:didNotResolve:',
             signature='v@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceDidStop:(NSNetService *)sender;
         _objc.selector(
             None, 
             selector='netServiceDidStop:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='netServiceBrowserWillSearch:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindDomain:(NSString *)domainString moreComing:(BOOL)moreComing;
         _objc.selector(
             None, 
             selector='netServiceBrowser:didFindDomain:moreComing:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindService:(NSNetService *)aNetService moreComing:(BOOL)moreComing;
         _objc.selector(
             None, 
             selector='netServiceBrowser:didFindService:moreComing:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didNotSearch:(NSDictionary *)errorDict;
         _objc.selector(
             None, 
             selector='netServiceBrowser:didNotSearch:',
             signature='v@:@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowserDidStopSearch:(NSNetServiceBrowser *)aNetServiceBrowser;
         _objc.selector(
             None, 
             selector='netServiceBrowserDidStopSearch:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didRemoveDomain:(NSString *)domainString moreComing:(BOOL)moreComing;
         _objc.selector(
             None, 
             selector='netServiceBrowser:didRemoveDomain:moreComing:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
 # - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didRemoveService:(NSNetService *)aNetService moreComing:(BOOL)moreComing;
         _objc.selector(
             None, 
             selector='netServiceBrowser:didRemoveService:moreComing:',
             signature='v@:@@@',
-            required=0
+            isRequired=0
         ),
         ]
     )
             None, 
             selector='handlePortMessage:',
             signature='v@:@',
-            required=0
+            isRequired=0
         ),
         ]
     )

File pyobjc/Lib/Foundation/test/test_collections.py

 
         for k in d1:
             self.assertEqual(d1[k], d2[k],
-                             "assertSameDictionary() failed for key '%s'." % k)
+                             "assertSameDictionary() failed for key '%s'. [%s != %s]" % (k, d1[k], d2[k]))
         for k in d2:
             self.assertEqual(d1[k], d2[k],
-                             "assertSameDictionary() failed for key '%s'." % k)
+                             "assertSameDictionary() failed for key '%s'. [%s != %s]" % (k, d1[k], d2[k]))
                              
     def testConversion(self):
         originalNSDictionary = NSString.propertyList(samplePropertyList)

File pyobjc/Lib/Foundation/test/test_nslocalizedstring.py

         s = NSLocalizedString("hello world", "")
         objc.recycle_autorelease_pool()
         self.assertEquals (s, "hello world")
-        self.assertEquals (s.pyobjc_NSString().description(), "hello world")
+        self.assertEquals (s.nsstring().description(), "hello world")
 
         
 def suite():

File pyobjc/Lib/Foundation/test/test_nsstring.py

         self.assert_(isinstance(self.pyUniString, u"".__class__))
         self.assert_(isinstance(self.ns7String, unicode))
         self.assert_(isinstance(self.pyUniString, unicode))
+
+class TestMutable(unittest.TestCase):
+    def testSync(self):
+        """
+        Test that python and ObjC string representation are not
+        automaticly synchronized.
+        """
+        pyStr = NSMutableString.stringWithString_("hello")
+        ocStr= pyStr.nsstring()
+        self.assertEquals(pyStr, "hello")
+        self.assert_(isinstance(ocStr, NSMutableString))
+        ocStr.appendString_(" world")
+        self.assertEquals(pyStr, "hello")
+
+        pyStr.syncFromNSString()
+
+        self.assertEquals(pyStr, "hello world")
+
         
 def suite():
     suite = unittest.TestSuite()

File pyobjc/Lib/objc/__init__.py

     gc.disable()
 
 # Aliases for some common Objective-C constants
-import __builtin__
-if hasattr(__builtin__, 'True'):
-    YES=True
-    NO=False
-else:
-    YES=1
-    NO=0
 nil=None
 
 from _objc import *
 from _objc import __version__
 import _FoundationSignatures
 
+_objc_bool = type(YES)
+
 # Import values used to define signatures
 import _objc
 gl = globals()
 except ImportError:
     pass
 
-del sys, __builtin__
+del sys

File pyobjc/Lib/objc/_convenience.py

             continue
 
         
-        if sel.selector.startswith('init') and not sel.class_method:
+        if sel.selector.startswith('init') and not sel.isClassMethod:
             # Instance methods that start with 'init*' are constructors. These
             # return 'self'. If they don't they reallocated the previous 
             # value, don't use that afterwards.
-            sel.returns_reallocated_self = 1
-            sel.is_initializer = 1
+            sel.returnsSelf = 1
+            sel.isInitializer = 1
         elif sel.selector == "alloc" or sel.selector == "allocWithZone:":
-            sel.is_alloc = 1
+            sel.isAlloc = 1
 
         if sel.selector in ( 'copy', 'copyWithZone:', 
                       'mutableCopy', 'mutableCopyWithZone:'):
             # These methods transfer ownership to the caller, the runtime uses
             # this information to adjust the reference count.
-            sel.donates_ref = 1
+            sel.doesDonateReference = 1
 
         sel = sel.selector
 
 
                     t = type_dict[name]
                     v = selector(value, selector=t.selector, 
-                        signature=t.signature, class_method=t.class_method)
-                    v.is_initializer = t.is_initializer
-                    v.returns_reallocated_self = t.returns_reallocated_self
-                    v.is_alloc = t.is_alloc
+                        signature=t.signature, isClassMethod=t.isClassMethod)
+                    v.isInitializer = t.isInitializer
+                    v.returnsSelf = t.returnsSelf
+                    v.isAlloc = t.isAlloc
+
+                    #if t.selector.startswith('init'):
+                    #    v.isInitializer = 1
+                    #    v.returnsSelf = 1
+                    #elif sel.selector == "alloc" \
+                    #        or sel.selector == "allocWithZone:":
+                    #    sel.isAlloc = 1
+
                     type_dict[name] = v
                 else:
                     type_dict[name] = value
     return self.arrayWithArray_(args[:-1])
 
 CONVENIENCE_METHODS['arrayWithObjects:'] = (
-    ('arrayWithObjects_', selector(arrayWithObjects_, signature='@@:@', class_method=1)),
+    ('arrayWithObjects_', selector(arrayWithObjects_, signature='@@:@', isClassMethod=1)),
 )
 
 def arrayWithObjects_count_(self, args, count):
     return self.arrayWithArray_(args[:count])
 
 CONVENIENCE_METHODS['arrayWithObjects:count:'] = (
-    ('arrayWithObjects_count_', selector(arrayWithObjects_count_, signature='@@:^@i', class_method=1)),
+    ('arrayWithObjects_count_', selector(arrayWithObjects_count_, signature='@@:^@i', isClassMethod=1)),
 )
 
 def initWithObjects_count_(self, args, count):
     return self.setWithArray_(args[:-1])
 
 CONVENIENCE_METHODS['setWithObjects:'] = (
-    ('setWithObjects_', selector(setWithObjects_, signature='@@:@', class_method=1)),
+    ('setWithObjects_', selector(setWithObjects_, signature='@@:@', isClassMethod=1)),
 )
 
 def setWithObjects_count_(self, args, count):
     return self.setWithArray_(args[:count])
 
 CONVENIENCE_METHODS['setWithObjects:count:'] = (
-    ('setWithObjects_count_', selector(setWithObjects_count_, signature='@@:^@i', class_method=1)),
+    ('setWithObjects_count_', selector(setWithObjects_count_, signature='@@:^@i', isClassMethod=1)),
 )
 
 def splitObjectsAndKeys(values):
 
 CONVENIENCE_METHODS['dictionaryWithObjectsAndKeys:'] = (
     ('dictionaryWithObjectsAndKeys_', 
-      selector(dictionaryWithObjectsAndKeys_, signature='@@:@',class_method=1)),
+      selector(dictionaryWithObjectsAndKeys_, signature='@@:@',isClassMethod=1)),
 )
 
 def initWithObjectsAndKeys_(self, *values):
 
 CONVENIENCE_METHODS['dictionaryWithObjects:forKeys:count:'] = (
     ('dictionaryWithObjects_forKeys_count_', 
-      selector(dictionaryWithObjects_forKeys_count_, signature='@@:^@^@i', class_method=1)),
+      selector(dictionaryWithObjects_forKeys_count_, signature='@@:^@^@i', isClassMethod=1)),
 )
 
 def initWithObjects_forKeys_count_(self, objects, keys, count):

File pyobjc/Lib/objc/test/test_methods.py

 Also Todo: Passing from Objective-C to python
 - Using NSInvocation '[obj forwardInvocation:inv]'
 - Using normal calls
+- Done: Return simple values, return structs, pass in basic types (c part)
 
 NOTES:
 - Always use makeCFloat when testing the value of a C float against a 
 DOUBLE_NUMBERS = [ 1.5, 3.5, 1e10, 1.99e10 ]
 OBJECTS = [ "hello", 1.0, range(4), lambda x: 10 ]
 DUMMY_OBJECTS = [ (1, 1), (-10, -10), (-4, -5), (0, 0), (10, 20) ]
+DUMMY2_OBJECTS = [ ((1, 2, 3, 4),), ((-9, -8, -7, -6),)]
 POINTS=[ (1.0, 2.0), (1e10, 2e10), (-0.5, 0.5) ]
 
 class MyPyClass:
         return DUMMY_OBJECTS[i]
     dummyFunc = objc.selector(dummyFunc, signature=OC_TestClass1.dummyFunc.signature)
 
+    def dummy2Func(self):
+        i = self.idx
+        self.idx += 1
+        return DUMMY2_OBJECTS[i]
+    dummy2Func = objc.selector(dummy2Func, signature=OC_TestClass1.dummy2Func.signature)
+
     def nspointFunc(self):
         i = self.idx
         self.idx += 1
         return POINTS[i]
     nspointFunc = objc.selector(nspointFunc, signature=OC_TestClass1.nspointFunc.signature)
 
+    def charArg_(self, arg):
+        return arg * 2
+    charArg_ = objc.selector(charArg_, signature=OC_TestClass1.charArg_.signature)
+    def ucharArg_(self, arg):
+        return arg * 2
+    ucharArg_ = objc.selector(ucharArg_, signature=OC_TestClass1.ucharArg_.signature)
+
+    def shortArg_(self, arg):
+        return arg * 2
+    shortArg_ = objc.selector(shortArg_, signature=OC_TestClass1.shortArg_.signature)
+
+    def ushortArg_(self, arg):
+        return arg * 2
+    ushortArg_ = objc.selector(ushortArg_, signature=OC_TestClass1.ushortArg_.signature)
+
+    def intArg_(self, arg):
+        return arg * 2
+    intArg_ = objc.selector(intArg_, signature=OC_TestClass1.intArg_.signature)
+
+    def uintArg_(self, arg):
+        return arg * 2
+    uintArg_ = objc.selector(uintArg_, signature=OC_TestClass1.uintArg_.signature)
+
+    def longArg_(self, arg):
+        return arg * 2
+    longArg_ = objc.selector(longArg_, signature=OC_TestClass1.longArg_.signature)
+
+    def ulongArg_(self, arg):
+        return arg * 2
+    ulongArg_ = objc.selector(ulongArg_, signature=OC_TestClass1.ulongArg_.signature)
+
+    def longlongArg_(self, arg):
+        return arg * 2
+    longlongArg_ = objc.selector(longlongArg_, signature=OC_TestClass1.longlongArg_.signature)
+
+    def ulonglongArg_(self, arg):
+        return arg * 2
+    ulonglongArg_ = objc.selector(ulonglongArg_, signature=OC_TestClass1.ulonglongArg_.signature)
+
+    def floatArg_(self, arg):
+        return arg * 2
+    floatArg_ = objc.selector(floatArg_, signature=OC_TestClass1.floatArg_.signature)
+
+    def doubleArg_(self, arg):
+        return arg * 2
+    doubleArg_ = objc.selector(doubleArg_, signature=OC_TestClass1.doubleArg_.signature)
+
+
 class OCPyTestSimpleCalls(unittest.TestCase):
     #
     # Test argument passing of single basic values by reference.
         for o in DUMMY_OBJECTS:
             self.assertEquals(self.obj.invokeInstanceDummyFuncOf_(self.ocobj), o)
 
+    def testCStruct2(self):
+        self.pyobj.reset()
+        self.ocobj.reset()
+
+        for o in DUMMY2_OBJECTS:
+            self.assertEquals(self.obj.callInstanceDummy2FuncOf_(self.ocobj), o)
+
+    def testIStruct2(self):
+        self.pyobj.reset()
+        self.ocobj.reset()
+
+        for o in DUMMY2_OBJECTS:
+            self.assertEquals(self.obj.invokeInstanceDummy2FuncOf_(self.ocobj), o)
+
     def testCNSPoint(self):
         self.pyobj.reset()
         self.ocobj.reset()
         for o in POINTS:
             self.assertEquals(self.obj.invokeInstanceNSPointFuncOf_(self.ocobj), o)
 
+class OCPyTestSimpleArguments(unittest.TestCase):
+    #
+    # Test argument passing of single basic values.
+    #
+    # TODO: Copy and adapt rest of OCPyTestSimpleArguments
+    #
 
-def suite():
+    def setUp(self):
+        self.ocobj = MyOCClass.new()
+        self.obj = OC_TestClass2.new()
+
+    def testCLongLong(self):
+        self.assertEquals(self.obj.callInstanceLongLongArg_on_(0, self.ocobj), 0)
+        self.assertEquals(self.obj.callInstanceLongLongArg_on_(10, self.ocobj), 20)
+        self.assertEquals(self.obj.callInstanceLongLongArg_on_(1L << 60, self.ocobj), 1L << 61)
+        self.assertEquals(self.obj.callInstanceLongLongArg_on_(-10, self.ocobj), -20)
+        self.assertEquals(self.obj.callInstanceLongLongArg_on_(-(1L << 60), self.ocobj), -(1L << 61))
+
+    def testILongLong(self):
+        self.assertEquals(self.obj.invokeInstanceLongLongArg_on_(0, self.ocobj), 0)
+        self.assertEquals(self.obj.invokeInstanceLongLongArg_on_(10, self.ocobj), 20)
+        self.assertEquals(self.obj.invokeInstanceLongLongArg_on_(1L << 60, self.ocobj), 1L << 61)
+        self.assertEquals(self.obj.invokeInstanceLongLongArg_on_(-10, self.ocobj), -20)
+        self.assertEquals(self.obj.invokeInstanceLongLongArg_on_(-(1L << 60), self.ocobj), -(1L << 61))
+
+def suite(self):
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestTypeStr))
-    suite.addTest(unittest.makeSuite(TestSimpleCalls))
-    suite.addTest(unittest.makeSuite(TestSimpleArguments))
-    suite.addTest(unittest.makeSuite(TestByReferenceArguments))
+
+    suite.addTest(unittest.makeSuite(PyOCTestTypeStr))
+    suite.addTest(unittest.makeSuite(PyOCTestSimpleReturns))
+    suite.addTest(unittest.makeSuite(PyOCTestSimpleArguments))
+    suite.addTest(unittest.makeSuite(PyOCTestByReferenceArguments))
+
+    suite.addTest(unittest.makeSuite(OCPyTestSimpleCalls))
+    suite.addTest(unittest.makeSuite(OCPyTestSimpleArguments))
+
     return suite
 
 if __name__ == '__main__':

File pyobjc/Lib/objc/test/testbndl.m

 /*
  * This file implements a (number of) class(es) that are used to test
  * method calling with PyObjC (both python -> ObjC and back)
+ *
+ * NOTES
+ * - The implementation must be synchronized with test_methods.py, see that
+ *   file for more details.
+ * - When adding new methods to OC_TestClass1 *always* add invoke- and call-
+ *   variants to OC_TestClass2.
  */
 #import <Foundation/Foundation.h>
 
 -(struct dummy2)callInstanceDummy2FuncOf:(OC_TestClass1*)arg;
 -(NSPoint)callInstanceNSPointFuncOf:(OC_TestClass1*)arg;
 
+- (long long)callInstanceLongLongArg:(long long)arg on:(OC_TestClass1*)obj;
+- (unsigned long long)callInstanceUnsignedLongLongArg:(unsigned long long)arg on:(OC_TestClass1*)obj;
+- (long)callInstanceLongArg:(long)arg on:(OC_TestClass1*)obj;
+- (unsigned long)callInstanceUnsignedLongArg:(unsigned long)arg on:(OC_TestClass1*)obj;
+- (int)callInstanceIntArg:(int)arg on:(OC_TestClass1*)obj;
+- (unsigned int)callInstanceUnsignedIntArg:(unsigned int)arg on:(OC_TestClass1*)obj;
+- (short)callInstanceShortArg:(short)arg on:(OC_TestClass1*)obj;
+- (unsigned short)callInstanceUnsignedShortArg:(unsigned short)arg on:(OC_TestClass1*)obj;
+- (char)callInstanceCharArg:(char)arg on:(OC_TestClass1*)obj;
+- (unsigned char)callInstanceUnsignedCharArg:(unsigned char)arg on:(OC_TestClass1*)obj;
+- (float)callInstanceFloatArg:(float)arg on:(OC_TestClass1*)obj;
+- (double)callInstanceDoubleArg:(double)arg on:(OC_TestClass1*)obj;
+- (char*)callInstanceCharpArg:(char*)arg on:(OC_TestClass1*)obj;
+- (id)callInstanceIdArg:(id)arg on:(OC_TestClass1*)obj;
+
 /* "NSInvocation" calls */
 -(char)invokeInstanceCharFuncOf:(OC_TestClass1*)arg;
 -(unsigned char)invokeInstanceUnsignedCharFuncOf:(OC_TestClass1*)arg;
 -(struct dummy2)invokeInstanceDummy2FuncOf:(OC_TestClass1*)arg;
 -(NSPoint)invokeInstanceNSPointFuncOf:(OC_TestClass1*)arg;
 
+- (long long)invokeInstanceLongLongArg:(long long)arg on:(OC_TestClass1*)obj;
+- (unsigned long long)invokeInstanceUnsignedLongLongArg:(unsigned long long)arg on:(OC_TestClass1*)obj;
+- (long)invokeInstanceLongArg:(long)arg on:(OC_TestClass1*)obj;
+- (unsigned long)invokeInstanceUnsignedLongArg:(unsigned long)arg on:(OC_TestClass1*)obj;
+- (int)invokeInstanceIntArg:(int)arg on:(OC_TestClass1*)obj;
+- (unsigned int)invokeInstanceUnsignedIntArg:(unsigned int)arg on:(OC_TestClass1*)obj;
+- (short)invokeInstanceShortArg:(short)arg on:(OC_TestClass1*)obj;
+- (unsigned short)invokeInstanceUnsignedShortArg:(unsigned short)arg on:(OC_TestClass1*)obj;
+- (char)invokeInstanceCharArg:(char)arg on:(OC_TestClass1*)obj;
+- (unsigned char)invokeInstanceUnsignedCharArg:(unsigned char)arg on:(OC_TestClass1*)obj;
+- (float)invokeInstanceFloatArg:(float)arg on:(OC_TestClass1*)obj;
+- (double)invokeInstanceDoubleArg:(double)arg on:(OC_TestClass1*)obj;
+- (char*)invokeInstanceCharpArg:(char*)arg on:(OC_TestClass1*)obj;
+- (id)invokeInstanceIdArg:(id)arg on:(OC_TestClass1*)obj;
+
 @end
 
 
 #define SETUP_INVOCATION(inv, target, selector) \
 	inv = [NSInvocation invocationWithMethodSignature: \
-		[arg methodSignatureForSelector:selector]]; \
+		[target methodSignatureForSelector:selector]]; \
 	[inv setTarget:target]; \
 	[inv setSelector:selector]; 
 
 	return [arg nspointFunc];
 }
 
+- (long long)callInstanceLongLongArg:(long long)arg on:(OC_TestClass1*)obj;
+{
+	return [obj longlongArg:arg];
+}
+
+- (unsigned long long)callInstanceUnsignedLongLongArg:(unsigned long long)arg on:(OC_TestClass1*)obj;
+{
+	return [obj ulonglongArg:arg];
+}
+
+- (long)callInstanceLongArg:(long)arg on:(OC_TestClass1*)obj;
+{
+	return [obj longArg:arg];
+}
+
+- (unsigned long)callInstanceUnsignedLongArg:(unsigned long)arg on:(OC_TestClass1*)obj;
+{
+	return [obj ulongArg:arg];
+}
+
+- (int)callInstanceIntArg:(int)arg on:(OC_TestClass1*)obj;
+{
+	return [obj intArg:arg];
+}
+
+- (unsigned int)callInstanceUnsignedIntArg:(unsigned int)arg on:(OC_TestClass1*)obj;
+{
+	return [obj uintArg:arg];
+}
+
+- (short)callInstanceShortArg:(short)arg on:(OC_TestClass1*)obj;
+{
+	return [obj shortArg:arg];
+}
+
+- (unsigned short)callInstanceUnsignedShortArg:(unsigned short)arg on:(OC_TestClass1*)obj;
+{
+	return [obj ushortArg:arg];
+}
+
+- (char)callInstanceCharArg:(char)arg on:(OC_TestClass1*)obj;
+{
+	return [obj charArg:arg];
+}
+
+- (unsigned char)callInstanceUnsignedCharArg:(unsigned char)arg on:(OC_TestClass1*)obj;
+{
+	return [obj ucharArg:arg];
+}
+
+- (float)callInstanceFloatArg:(float)arg on:(OC_TestClass1*)obj;
+{
+	return [obj floatArg:arg];
+}
+
+- (double)callInstanceDoubleArg:(double)arg on:(OC_TestClass1*)obj;
+{
+	return [obj doubleArg:arg];
+}
+
+- (char*)callInstanceCharpArg:(char*)arg on:(OC_TestClass1*)obj;
+{
+	return [obj charpArg:arg];
+}
+
+- (id)callInstanceIdArg:(id)arg on:(OC_TestClass1*)obj;
+{
+	return [obj idArg:arg];
+}
+
+
 
 -(long long)invokeInstanceLongLongFuncOf:(OC_TestClass1*)arg
 {
 	struct dummy2 res;
 	NSInvocation* inv;
 
-	SETUP_INVOCATION(inv, arg, @selector(dummyFunc))
+	SETUP_INVOCATION(inv, arg, @selector(dummy2Func))
 	
 	[arg forwardInvocation:inv];
 	[inv getReturnValue:&res];
 	return res;
 }
 
+- (long long)invokeInstanceLongLongArg:(long long)arg on:(OC_TestClass1*)obj;
+{
+	long long res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(longlongArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (unsigned long long)invokeInstanceUnsignedLongLongArg:(unsigned long long)arg on:(OC_TestClass1*)obj;
+{
+	unsigned long long res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(ulonglongArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (long)invokeInstanceLongArg:(long)arg on:(OC_TestClass1*)obj;
+{
+	long res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(longArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (unsigned long)invokeInstanceUnsignedLongArg:(unsigned long)arg on:(OC_TestClass1*)obj;
+{
+	unsigned long res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(ulonglongArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (int)invokeInstanceIntArg:(int)arg on:(OC_TestClass1*)obj;
+{
+	int res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(intArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (unsigned int)invokeInstanceUnsignedIntArg:(unsigned int)arg on:(OC_TestClass1*)obj;
+{
+	unsigned int res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(uintArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (short)invokeInstanceShortArg:(short)arg on:(OC_TestClass1*)obj;
+{
+	short res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(shortArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (unsigned short)invokeInstanceUnsignedShortArg:(unsigned short)arg on:(OC_TestClass1*)obj;
+{
+	unsigned short res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(ushortArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (char)invokeInstanceCharArg:(char)arg on:(OC_TestClass1*)obj;
+{
+	char res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(charArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (unsigned char)invokeInstanceUnsignedCharArg:(unsigned char)arg on:(OC_TestClass1*)obj;
+{
+	unsigned char res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(ucharArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (float)invokeInstanceFloatArg:(float)arg on:(OC_TestClass1*)obj;
+{
+	float res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(floatArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (double)invokeInstanceDoubleArg:(double)arg on:(OC_TestClass1*)obj;
+{
+	double res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(doubleArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (char*)invokeInstanceCharpArg:(char*)arg on:(OC_TestClass1*)obj;
+{
+	char* res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(charpArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+- (id)invokeInstanceIdArg:(id)arg on:(OC_TestClass1*)obj;
+{
+	id res;
+	NSInvocation* inv;
+
+	SETUP_INVOCATION(inv, obj, @selector(idArg:))
+	[inv setArgument:&arg atIndex:2]; // First real argument
+	
+	[obj forwardInvocation:inv];
+	[inv getReturnValue:&res];
+	return res;
+}
+
+
 @end
 
 
 	if (ObjC_ImportModule(m) < 0) return;
 
 	PyModule_AddObject(m, "OC_TestClass1", 
-		ObjCClass_New([OC_TestClass1 class]));
+		PyObjCClass_New([OC_TestClass1 class]));
 	PyModule_AddObject(m, "OC_TestClass2", 
-		ObjCClass_New([OC_TestClass2 class]));
+		PyObjCClass_New([OC_TestClass2 class]));
 	
 }

File pyobjc/Modules/AppKit/_AppKitMapping.m

   colorSpaceNameString = [NSString stringWithCString: colorSpaceName];
 
   NS_DURING
-    newImageRep = objc_msgSend(ObjCObject_GetObject(self), 
+    newImageRep = objc_msgSend(PyObjCObject_GetObject(self), 
 			       @selector(initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:), dataPlanes, width, height, bps, spp, hasAlpha, isPlanar, colorSpaceNameString, bpr, bpp);
 
     result = ObjC_IdToPython(newImageRep);
   colorSpaceNameString = [NSString stringWithCString: colorSpaceName];
 
   NS_DURING
-    RECEIVER(super) = ObjCObject_GetObject(self);
-    super.class = ObjCClass_GetClass((PyObject*)(self->ob_type));
+    RECEIVER(super) = PyObjCObject_GetObject(self);
+    super.class = PyObjCClass_GetClass((PyObject*)(self->ob_type));
     
     newImageRep = objc_msgSendSuper(&super,
 			       @selector(initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:), dataPlanes, width, height, bps, spp, hasAlpha, isPlanar, colorSpaceNameString, bpr, bpp);