Ronald Oussoren avatar Ronald Oussoren committed abdb105

Small fixes, still not perfect.

Comments (0)

Files changed (3)

pyobjc-framework-SearchKit/Lib/SearchKit/PyObjC.bridgesupport

   <function name='SKIndexCopyDocumentRefsForDocumentIDs'>
     <arg type='^{__SKIndex=}' />
     <arg type='l' type64='l' />
-    <arg c_array_length_in_arg='1' type='^i' type64='^i' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^i' type64='^q' type_modifier='n' />
     <arg c_array_length_in_arg='1' type='^@' type64='^@' type_modifier='o' />
   </function>
   <function name='SKIndexCopyDocumentURLsForDocumentIDs'>
     <arg type='^{__SKIndex=}' />
     <arg type='l' type64='l' />
-    <arg c_array_length_in_arg='1' type='^i' type64='^i' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^i' type64='^q' type_modifier='n' />
     <arg already_retained='true' c_array_length_in_arg='1' type='^^{__CFURL}' type_modifier='o' />
   </function>
   <function name='SKIndexCopyInfoForDocumentIDs'>
     <arg type='^{__SKIndex=}' />
     <arg type='l' type64='l' />
-    <arg c_array_length_in_arg='1' type='^i' type64='^i' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^i' type64='^q' type_modifier='n' />
     <arg already_retained='true' c_array_length_in_arg='1' type='^^{__CFString}' type_modifier='o' />
-    <arg c_array_length_in_arg='1' type='^i' type64='^i' type_modifier='o' />
+    <arg c_array_length_in_arg='1' type='^i' type64='^q' type_modifier='o' />
   </function>
   <function name='SKIndexCopyTermIDArrayForDocumentID'>
     <retval already_cfretained='true' type='^{__CFArray=}' />
     <retval type='B' />
     <arg type='^{__SKSearch=}' />
     <arg type='l' type64='l' />
-    <arg c_array_length_in_arg='1,5' type='^i' type64='^i' type_modifier='o' />
+    <arg c_array_length_in_arg='1,5' type='^i' type64='^q' type_modifier='o' />
     <arg c_array_length_in_arg='1,5' type='^f' type_modifier='o' />
     <arg type='d' />
-    <arg type='^i' type64='^i' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
   </function>
   <function name='SKSearchGetTypeID'>
     <retval type='L' type64='Q' />
   <function comment='deprecated' name='SKSearchResultsGetInfoInRange'>
     <retval type='l' type64='q' />
     <arg type='^{__SKSearchResults=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=qq}' />
     <arg c_array_length_in_arg='1' c_array_length_in_result='true' type='^@' type64='^@' type_modifier='o' />
     <arg c_array_length_in_arg='1' c_array_length_in_result='true' type='^^{__SKIndex}' type_modifier='o' />
     <arg c_array_length_in_arg='1' c_array_length_in_result='true' type='^f' type_modifier='o' />
     <retval type='l' type64='q' />
     <arg type='^{__SKSummary=}' />
     <arg type='l' type64='l' />
-    <arg type='^i' type64='^i' type_modifier='o' />
-    <arg type='^i' type64='^i' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
   </function>
   <function name='SKSummaryGetSentenceCount'>
     <retval type='l' type64='q' />
     <retval type='l' type64='q' />
     <arg type='^{__SKSummary=}' />
     <arg type='l' type64='l' />
-    <arg type='^i' type64='^i' type_modifier='o' />
-    <arg type='^i' type64='^i' type_modifier='o' />
-    <arg type='^i' type64='^i' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
+    <arg type='^i' type64='^q' type_modifier='o' />
   </function>
   <function name='SKSummaryGetTypeID'>
     <retval type='L' type64='Q' />

pyobjc-framework-SearchKit/Lib/SearchKit/__init__.py

 
 try:
     SKIndexGetTypeID
+    SKDocumentRef
 
 except NameError:
     # SKIndexGetTypeID is documented, but not actually exported by Leopard. Try to
                 # a SKSearch object
                 SKSearchCreate(rI, "q", 0)
                 searchref = objc.registerCFSignature(
-                        "SKSearchRef", "^{__SKSearch=}", SKSearchGetTypeID())
+                        "SKSearchRef", b"^{__SKSearch=}", SKSearchGetTypeID())
             else:
                 searchref = SKSearchRef
 
             return summaryID
 
         indexType = objc.registerCFSignature(
-                "SKIndexRef", "^{__SKIndex=}", indexID)
+                "SKIndexRef", b"^{__SKIndex=}", indexID)
         iterType = objc.registerCFSignature(
-                "SKIndexDocumentIteratorRef", "^{__SKIndexDocumentIterator=}", indexID)
+                "SKIndexDocumentIteratorRef", b"^{__SKIndexDocumentIterator=}", indexID)
         groupType = objc.registerCFSignature(
-                "SKSearchGroupRef", "^{__SKSearchGroup=}", groupID)
+                "SKSearchGroupRef", b"^{__SKSearchGroup=}", groupID)
         resultType = objc.registerCFSignature(
-                "SKSearchResultsRef", "^{__SKSearchResults=}", resultID)
+                "SKSearchResultsRef", b"^{__SKSearchResults=}", resultID)
         summaryType = objc.registerCFSignature(
-                "SKSummaryRef", "^{__SKSummary=}", summaryID)
+                "SKSummaryRef", b"^{__SKSummary=}", summaryID)
 
         # For some reason SKDocumentGetTypeID doesn't return the right value
         # when the framework loader calls it the first time around,
         # by this time the framework is fully initialized and we get
         # the correct result.
         SKDocumentRef = objc.registerCFSignature(
-                "SKDocumentRef", "@", SKDocumentGetTypeID())
+                "SKDocumentRef", b"@", SKDocumentGetTypeID())
 
 
         return (SKIndexGetTypeID, indexType, SKIndexDocumentIteratorGetTypeID, iterType, 
                 SKSearchGroupGetTypeID, groupType, SKSearchResultsGetTypeID, resultType,
-                SKSummaryGetTypeID, summaryType,
+                SKSummaryGetTypeID, summaryType, iterType,
                 SKDocumentRef, searchref)
 
     (SKIndexGetTypeID, SKIndexRef, 
         SKSearchGroupGetTypeID, SKSearchGroupRef,
         SKSearchResultsGetTypeID, SKSearchResultsRef,
         SKSummaryGetTypeID, SKSummaryRef,
+        SKIndexDocumentIteratorRef,
         SKDocumentRef, SKSearchRef,
     ) = workaround()
 
+    print "performed workaround"
+
     del workaround

pyobjc-framework-SearchKit/distribute_setup.py

             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.8"
+DEFAULT_VERSION = "0.6.4"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.