[PyObjC-svn] r2358 - in trunk/pyobjc/pyobjc-framework-CoreData: . Examples/DragApp Lib/CoreData PyObjCTest

[email protected] Tue, 24 Nov 2009 09:01:02 -0600
Newsgroups gmane.comp.python.pyobjc.cvs
Message-ID <[email protected]>
Author: ronaldoussoren
Date: Tue Nov 24 09:01:02 2009
New Revision: 2358

Log:
Bump version to 2.2

Added:
   trunk/pyobjc/pyobjc-framework-CoreData/Examples/DragApp/summary.txt
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmappingmodel.py   (contents, props changed)
Modified:
   trunk/pyobjc/pyobjc-framework-CoreData/Lib/CoreData/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredatadefines.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredataerrors.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsattributedescription.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsfetchrequest.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobject.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobjectcontext.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmigrationmanager.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstore.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstorecoordinator.py
   trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspropertydescription.py
   trunk/pyobjc/pyobjc-framework-CoreData/setup.py

Modified: trunk/pyobjc/pyobjc-framework-CoreData/Lib/CoreData/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/Lib/CoreData/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/Lib/CoreData/PyObjC.bridgesupport	Tue Nov 24 09:01:02 2009
@@ -3,6 +3,22 @@
 <signatures version='1.0'>
   <depends_on path='/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation' />
   <depends_on path='/System/Library/Frameworks/Foundation.framework/Foundation' />
+  <enum name='NSDictionaryResultType' value='2' />
+  <constant name='NSPersistentStoreCoordinatorWillRemoveStoreNotification' type='@' />
+  <constant name='NSManagedObjectContextWillSaveNotification' type='@' />
+  <constant name='NSSQLiteAnalyzeOption' type='@' />
+  <constant name='NSSQLiteManualVacuumOption' type='@' />
+  <constant name='NSInferMappingModelAutomaticallyOption' type='@' />
+  <constant name='NSXMLExternalRecordType' type='@' />
+  <constant name='NSBinaryExternalRecordType' type='@' />
+  <constant name='NSExternalRecordsFileFormatOption' type='@' />
+  <constant name='NSExternalRecordsDirectoryOption' type='@' />
+  <constant name='NSExternalRecordExtensionOption' type='@' />
+  <constant name='NSEntityNameInPathKey' type='@' />
+  <constant name='NSStoreUUIDInPathKey' type='@' />
+  <constant name='NSStorePathKey' type='@' />
+  <constant name='NSModelPathKey' type='@' />
+  <constant name='NSObjectURIKey' type='@' />
   <constant name='NSAddedPersistentStoresKey' type='@' />
   <constant name='NSAffectedObjectsErrorKey' type='@' />
   <constant name='NSAffectedStoresErrorKey' type='@' />
@@ -57,6 +73,10 @@
   <enum name='NSCoreDataError' value='134060' />
   <enum name='NSCoreDataVersionNumber10_4' value='46.0' />
   <enum name='NSCoreDataVersionNumber10_4_3' value='77.0' />
+  <enum name='NSCoreDataVersionNumber10_5' value='185.0' />
+  <enum name='NSCoreDataVersionNumber10_5_3' value='186.0' />
+  <enum name='NSInferredMappingModelError' value='134190' />
+  <enum name='NSExternalRecordImportError' value='134200' />
   <enum name='NSCustomEntityMappingType' value='1' />
   <enum name='NSDateAttributeType' value='900' />
   <enum name='NSDecimalAttributeType' value='400' />
@@ -98,6 +118,7 @@
   <enum name='NSStringAttributeType' value='700' />
   <enum name='NSTransformEntityMappingType' value='5' />
   <enum name='NSTransformableAttributeType' value='1800' />
+  <enum name='NSObjectIDAttributeType' value='2000' />
   <enum name='NSUndefinedAttributeType' value='0' />
   <enum name='NSUndefinedEntityMappingType' value='0' />
   <enum name='NSValidationDateTooLateError' value='1630' />
@@ -113,6 +134,12 @@
   <enum name='NSValidationStringPatternMatchingError' value='1680' />
   <enum name='NSValidationStringTooLongError' value='1660' />
   <enum name='NSValidationStringTooShortError' value='1670' />
+  <enum name='NSSnapshotEventUndoInsertion' value='2' />
+  <enum name='NSSnapshotEventUndoDeletion' value='4' />
+  <enum name='NSSnapshotEventUndoUpdate' value='8' />
+  <enum name='NSSnapshotEventRollback' value='16' />
+  <enum name='NSSnapshotEventRefresh' value='32' />
+  <enum name='NSSnapshotEventMergePolicy' value='64' />
   <class name='NSAtomicStore'>
     <method selector='load:'>
       <retval type='B' />
@@ -165,6 +192,18 @@
     </method>
   </class>
   <class name='NSFetchRequest'>
+    <method selector='includesPendingChanges'>
+      <retval type='B' />
+    </method>
+    <method selector='setIncludesPendingChanges:'>
+      <arg index='0' type='B' />
+    </method>
+    <method selector='returnsDistinctResults'>
+      <retval type='B' />
+    </method>
+    <method selector='setReturnsDistinctResults:'>
+      <arg index='0' type='B' />
+    </method>
     <method selector='includesPropertyValues'>
       <retval type='B' />
     </method>
@@ -193,6 +232,9 @@
     </method>
   </class>
   <class name='NSManagedObject'>
+    <method class_method='true' selector='contextShouldIgnoreUnmodeledPropertyChanges'>
+      <retval type='B' />
+    </method>
     <method selector='hasFaultForRelationshipNamed:'>
       <retval type='B' />
     </method>
@@ -233,6 +275,9 @@
     </method>
   </class>
   <class name='NSManagedObjectContext'>
+    <method selector='existingObjectWithID:error:'>
+      <arg index='1' type_modifier='o' />
+    </method>
     <method selector='countForFetchRequest:error:'>
       <arg index='1' type_modifier='o' />
     </method>
@@ -289,6 +334,13 @@
     </method>
   </class>
   <class name='NSPersistentStore'>
+    <method selector='loadMetadata'>
+      <retval type='B'/>
+    </method>
+    <method selector='loadMetadata:'>
+      <retval type='B'/>
+      <arg index='0' type_modifier='o' />
+    </method>
     <method selector='isReadOnly'>
       <retval type='B' />
     </method>
@@ -330,6 +382,9 @@
     <method selector='tryLock'>
       <retval type='B' />
     </method>
+    <method selector='importStoreWithIdentifier:fromExternalRecordsDirectory:toURL:options:withType:error:'>
+	    <arg index='5' type_modifier='o' />
+    </method>
   </class>
   <class name='NSPropertyDescription'>
     <method selector='isIndexed'>
@@ -350,11 +405,27 @@
     <method selector='setTransient:'>
       <arg index='0' type='B' />
     </method>
+    <method selector='isIndexedBySpotlight'>
+      <retval type='B' />
+    </method>
+    <method selector='setIndexedBySpotlight:'>
+      <arg index='0' type='B' />
+    </method>
+    <method selector='isStoredInExternalRecord'>
+      <retval type='B' />
+    </method>
+    <method selector='setStoredInExternalRecord:'>
+      <arg index='0' type='B' />
+    </method>
   </class>
   <class name='NSRelationshipDescription'>
     <method selector='isToMany'>
       <retval type='B' />
     </method>
   </class>
+  <class name='NSMappingModel'>
+    <method class_method='true' selector='inferredMappingModelForSourceModel:destinationModel:error:'>
+      <arg index='2' type_modifier='o' />
+    </method>
+  </class>
 </signatures>
-

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredatadefines.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredatadefines.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredatadefines.py	Tue Nov 24 09:01:02 2009
@@ -9,6 +9,11 @@
         self.failUnlessEqual(NSCoreDataVersionNumber10_4, 46.0)
         self.failUnlessEqual(NSCoreDataVersionNumber10_4_3, 77.0)
 
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+        self.failUnlessEqual(NSCoreDataVersionNumber10_5, 185.0)
+        self.failUnlessEqual(NSCoreDataVersionNumber10_5_3, 186.0)
+
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredataerrors.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredataerrors.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_coredataerrors.py	Tue Nov 24 09:01:02 2009
@@ -4,6 +4,12 @@
 
 class TestCoreDataErrors (TestCase):
 
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+        self.failUnlessEqual(NSInferredMappingModelError, 134190)
+        self.failUnlessEqual(NSExternalRecordImportError, 134200)
+
+
     @min_os_level("10.5")
     def testConstants10_5(self):
         self.failUnlessIsInstance(NSSQLiteErrorDomain, unicode)

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsattributedescription.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsattributedescription.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsattributedescription.py	Tue Nov 24 09:01:02 2009
@@ -20,6 +20,10 @@
     def testConstants10_5(self):
         self.failUnlessEqual(NSTransformableAttributeType, 1800)
 
+    @min_os_level("10.6")
+    def testConstants10_6(self):
+        self.failUnlessEqual(NSObjectIDAttributeType, 2000)
+
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsfetchrequest.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsfetchrequest.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsfetchrequest.py	Tue Nov 24 09:01:02 2009
@@ -19,7 +19,16 @@
         self.failUnlessResultIsBOOL(NSFetchRequest.returnsObjectsAsFaults)
         self.failUnlessArgIsBOOL(NSFetchRequest.setReturnsObjectsAsFaults_, 0)
 
+    @min_os_level("10.6")
+    def testConstants10_6(self):
+        self.failUnlessEqual(NSDictionaryResultType, 2)
 
+    @min_os_level("10.6")
+    def testMethods10_6(self):
+        self.failUnlessResultIsBOOL(NSFetchRequest.includesPendingChanges)
+        self.failUnlessArgIsBOOL(NSFetchRequest.setIncludesPendingChanges_, 0)
+        self.failUnlessResultIsBOOL(NSFetchRequest.returnsDistinctResults)
+        self.failUnlessArgIsBOOL(NSFetchRequest.setReturnsDistinctResults_, 0)
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobject.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobject.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobject.py	Tue Nov 24 09:01:02 2009
@@ -26,5 +26,15 @@
     def testMethods10_5(self):
         self.failUnlessResultIsBOOL(NSManagedObject.hasFaultForRelationshipNamed_)
 
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+        self.failUnlessEqual(NSSnapshotEventUndoInsertion, 1 << 1)
+        self.failUnlessEqual(NSSnapshotEventUndoDeletion, 1 << 2)
+        self.failUnlessEqual(NSSnapshotEventUndoUpdate, 1 << 3)
+        self.failUnlessEqual(NSSnapshotEventRollback, 1 << 4)
+        self.failUnlessEqual(NSSnapshotEventRefresh, 1 << 5)
+        self.failUnlessEqual(NSSnapshotEventMergePolicy, 1 << 6)
+
+
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobjectcontext.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobjectcontext.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmanagedobjectcontext.py	Tue Nov 24 09:01:02 2009
@@ -8,6 +8,7 @@
         self.failUnlessIsInstance(NSRefreshedObjectsKey, unicode)
         self.failUnlessIsInstance(NSInvalidatedObjectsKey, unicode)
         self.failUnlessIsInstance(NSInvalidatedAllObjectsKey, unicode)
+        self.failUnlessIsInstance(NSManagedObjectContextWillSaveNotification, unicode)
 
     def testConstants(self):
         self.failUnlessIsInstance(NSManagedObjectContextDidSaveNotification, unicode)
@@ -42,6 +43,10 @@
         self.failUnlessResultIsBOOL(NSManagedObjectContext.obtainPermanentIDsForObjects_error_)
         self.failUnlessArgIsOut(NSManagedObjectContext.obtainPermanentIDsForObjects_error_, 1)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessArgIsOut(NSManagedObjectContext.existingObjectWithID_error_, 1)
+
 
 
 if __name__ == "__main__":

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmigrationmanager.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmigrationmanager.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nsmigrationmanager.py	Tue Nov 24 09:01:02 2009
@@ -9,5 +9,11 @@
         self.failUnlessResultIsBOOL(NSMigrationManager.migrateStoreFromURL_type_options_withMappingModel_toDestinationURL_destinationType_destinationOptions_error_)
         self.failUnlessArgIsOut(NSMigrationManager.migrateStoreFromURL_type_options_withMappingModel_toDestinationURL_destinationType_destinationOptions_error_, 7)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        #self.failUnlessArgIsOut(NSMigrationManager.loadMetadata_, 0)
+        #self.failUnlessResultIsBOOL(NSMigrationManager.loadMetadata_)
+        pass
+
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstore.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstore.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstore.py	Tue Nov 24 09:01:02 2009
@@ -11,6 +11,11 @@
         self.failUnlessResultIsBOOL(NSPersistentStore.isReadOnly)
         self.failUnlessArgIsBOOL(NSPersistentStore.setReadOnly_, 0)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessResultIsBOOL(NSPersistentStore.loadMetadata_)
+        self.failUnlessArgIsOut(NSPersistentStore.loadMetadata_, 0)
+
 
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstorecoordinator.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstorecoordinator.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspersistentstorecoordinator.py	Tue Nov 24 09:01:02 2009
@@ -27,6 +27,28 @@
         self.failUnlessIsInstance(NSStoreModelVersionIdentifiersKey, unicode)
         self.failUnlessIsInstance(NSPersistentStoreOSCompatibility, unicode)
 
+        self.failUnlessIsInstance(NSPersistentStoreCoordinatorWillRemoveStoreNotification, unicode)
+        self.failUnlessIsInstance(NSSQLiteAnalyzeOption, unicode)
+
+    @min_os_level('10.6')
+    def testConstants10_6(self):
+        self.failUnlessIsInstance(NSSQLiteManualVacuumOption, unicode)
+        self.failUnlessIsInstance(NSInferMappingModelAutomaticallyOption, unicode)
+        self.failUnlessIsInstance(NSXMLExternalRecordType, unicode)
+        self.failUnlessIsInstance(NSBinaryExternalRecordType, unicode)
+        self.failUnlessIsInstance(NSExternalRecordsFileFormatOption, unicode)
+        self.failUnlessIsInstance(NSExternalRecordsDirectoryOption, unicode)
+        self.failUnlessIsInstance(NSExternalRecordExtensionOption, unicode)
+        self.failUnlessIsInstance(NSEntityNameInPathKey, unicode)
+        self.failUnlessIsInstance(NSStoreUUIDInPathKey, unicode)
+        self.failUnlessIsInstance(NSStorePathKey, unicode)
+        self.failUnlessIsInstance(NSModelPathKey, unicode)
+        self.failUnlessIsInstance(NSObjectURIKey, unicode)
+
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessArgIsOut(NSPersistentStoreCoordinator.importStoreWithIdentifier_fromExternalRecordsDirectory_toURL_options_withType_error_, 5)
+
     @min_os_level('10.5')
     def testMethods10_5(self):
         self.failUnlessArgIsOut(NSPersistentStoreCoordinator.metadataForPersistentStoreOfType_URL_error_, 2)

Modified: trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspropertydescription.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspropertydescription.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/PyObjCTest/test_nspropertydescription.py	Tue Nov 24 09:01:02 2009
@@ -15,5 +15,12 @@
         self.failUnlessResultIsBOOL(NSPropertyDescription.isIndexed)
         self.failUnlessArgIsBOOL(NSPropertyDescription.setIndexed_, 0)
 
+    @min_os_level('10.6')
+    def testMethods10_6(self):
+        self.failUnlessResultIsBOOL(NSPropertyDescription.isIndexedBySpotlight)
+        self.failUnlessArgIsBOOL(NSPropertyDescription.setIndexedBySpotlight_, 0)
+        self.failUnlessResultIsBOOL(NSPropertyDescription.isStoredInExternalRecord)
+        self.failUnlessArgIsBOOL(NSPropertyDescription.setStoredInExternalRecord_, 0)
+
 if __name__ == "__main__":
     main()

Modified: trunk/pyobjc/pyobjc-framework-CoreData/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreData/setup.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreData/setup.py	Tue Nov 24 09:01:02 2009
@@ -11,11 +11,11 @@
 from pyobjc_setup import *
 setup(
     name='pyobjc-framework-CoreData',
-    version='2.2b4',
+    version='2.2',
     description = "Wrappers for the framework CoreData on Mac OS X",
     packages = [ "CoreData" ],
     install_requires = [ 
-        'pyobjc-core>=2.2b4',
-        'pyobjc-framework-Cocoa>=2.2b4',
+        'pyobjc-core>=2.2',
+        'pyobjc-framework-Cocoa>=2.2',
     ],
 )

------------------------------------------------------------------------------
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