[PyObjC-svn] r2494 - in trunk/pyobjc/pyobjc-framework-SearchKit: . Lib/SearchKit
[email protected] Thu, 10 Jun 2010 19:21:42 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Thu Jun 10 19:21:42 2010
New Revision: 2494
Log:
Small fixes, still not perfect.
Modified:
trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/PyObjC.bridgesupport
trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/__init__.py
trunk/pyobjc/pyobjc-framework-SearchKit/distribute_setup.py
Modified: trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/PyObjC.bridgesupport (original)
+++ trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/PyObjC.bridgesupport Thu Jun 10 19:21:42 2010
@@ -102,21 +102,21 @@
<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=}' />
@@ -272,10 +272,10 @@
<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' />
@@ -330,7 +330,7 @@
<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' />
@@ -370,8 +370,8 @@
<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' />
@@ -381,9 +381,9 @@
<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' />
Modified: trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/__init__.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/__init__.py (original)
+++ trunk/pyobjc/pyobjc-framework-SearchKit/Lib/SearchKit/__init__.py Thu Jun 10 19:21:42 2010
@@ -16,6 +16,7 @@
try:
SKIndexGetTypeID
+ SKDocumentRef
except NameError:
# SKIndexGetTypeID is documented, but not actually exported by Leopard. Try to
@@ -49,7 +50,7 @@
# a SKSearch object
SKSearchCreate(rI, "q", 0)
searchref = objc.registerCFSignature(
- "SKSearchRef", "^{__SKSearch=}", SKSearchGetTypeID())
+ "SKSearchRef", b"^{__SKSearch=}", SKSearchGetTypeID())
else:
searchref = SKSearchRef
@@ -79,27 +80,27 @@
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,
@@ -107,7 +108,10 @@
SKSearchGroupGetTypeID, SKSearchGroupRef,
SKSearchResultsGetTypeID, SKSearchResultsRef,
SKSummaryGetTypeID, SKSummaryRef,
+ SKIndexDocumentIteratorRef,
SKDocumentRef, SKSearchRef,
) = workaround()
+ print "performed workaround"
+
del workaround
Modified: trunk/pyobjc/pyobjc-framework-SearchKit/distribute_setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SearchKit/distribute_setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-SearchKit/distribute_setup.py Thu Jun 10 19:21:42 2010
@@ -46,7 +46,7 @@
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
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo