[PyObjC-svn] r2271 - in trunk/pyobjc/pyobjc-framework-AddressBook: Lib/AddressBook PyObjCTest

Author: ronaldoussoren
Date: Tue Sep  1 11:04:50 2009
New Revision: 2271

Log:
- Port to snowleopard.
- One test fails on SL, haven't checked yet if that is a problem
  in the OS or PyObjC.


Modified:
   trunk/pyobjc/pyobjc-framework-AddressBook/Lib/AddressBook/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abaddressbookc.py
   trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abglobals.py
   trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abpeoplepickerc.py

Modified: trunk/pyobjc/pyobjc-framework-AddressBook/Lib/AddressBook/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AddressBook/Lib/AddressBook/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-AddressBook/Lib/AddressBook/PyObjC.bridgesupport	Tue Sep  1 11:04:50 2009
@@ -81,8 +81,9 @@
   <constant name='kABPersonRecordType' type='^{__CFString=}' />
   <constant name='kABPhoneHomeFAXLabel' type='@' />
   <constant name='kABPhoneHomeLabel' type='@' />
-  <constant name='kABPhoneMainLabel' type='@' />
+  <constant name='kABPhoneiPhoneLabel' type='@' />
   <constant name='kABPhoneMobileLabel' type='@' />
+  <constant name='kABPhoneMainLabel' type='@' />
   <constant name='kABPhonePagerLabel' type='@' />
   <constant name='kABPhoneProperty' type='@' />
   <constant name='kABPhoneWorkFAXLabel' type='@' />
@@ -100,6 +101,8 @@
   <constant name='kABYahooInstantProperty' type='@' />
   <constant name='kABYahooWorkLabel' type='@' />
   <enum name='ABMultipleValueSelection' value='2' />
+  <enum name='kABShowAsResource' value='2' />
+  <enum name='kABShowAsRoom' value='3' />
   <enum name='ABNoValueSelection' value='0' />
   <enum name='ABSingleValueSelection' value='1' />
   <enum name='kABArrayProperty' value='5' />

Modified: trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abaddressbookc.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abaddressbookc.py	(original)
+++ trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abaddressbookc.py	Tue Sep  1 11:04:50 2009
@@ -83,11 +83,11 @@
 
         v = ABCopyArrayOfAllPeople(ref)
         self.failUnlessResultIsCFRetained(ABCopyArrayOfAllPeople)
-        self.failUnlessIsInstance(v, CFArrayRef)
+        self.failUnlessIsInstance(v, NSArray)
 
         v = ABCopyArrayOfAllGroups(ref)
         self.failUnlessResultIsCFRetained(ABCopyArrayOfAllGroups)
-        self.failUnlessIsInstance(v, CFArrayRef)
+        self.failUnlessIsInstance(v, NSArray)
 
         self.failUnlessResultHasType(ABRecordCreateCopy, objc._C_ID)
         self.failUnlessResultIsCFRetained(ABRecordCreateCopy)

Modified: trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abglobals.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abglobals.py	(original)
+++ trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abglobals.py	Tue Sep  1 11:04:50 2009
@@ -7,6 +7,12 @@
     def testConstants10_5(self):
           self.failUnlessIsInstance(kABCalendarURIsProperty, unicode)
 
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+          self.failUnlessIsInstance(kABPhoneiPhoneLabel, unicode)
+          self.failUnlessEqual(kABShowAsResource, 2)
+          self.failUnlessEqual(kABShowAsRoom, 3)
+
     def testConstants(self):
         self.failUnlessEqual(kABShowAsMask, 07)
         self.failUnlessEqual(kABShowAsPerson, 00)

Modified: trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abpeoplepickerc.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abpeoplepickerc.py	(original)
+++ trunk/pyobjc/pyobjc-framework-AddressBook/PyObjCTest/test_abpeoplepickerc.py	Tue Sep  1 11:04:50 2009
@@ -24,7 +24,11 @@
     def testFunctions(self):
         self.failUnlessResultIsCFRetained(ABPickerCreate)
         ref = ABPickerCreate()
-        self.failUnlessIsInstance(ref, ABPickerRef)
+        try:
+            self.failUnlessIsInstance(ref, (ABPickerRef, objc.lookUpClass('ABPeoplePickerCAdapter')))
+
+        except objc.error:
+            self.failUnlessIsInstance(ref, ABPickerRef)
 
         ABPickerSetFrame(ref, ((90, 100), (200, 400)))
         r = ABPickerGetFrame(ref, None)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july