[PyObjC-svn] r2294 - in trunk/pyobjc/pyobjc-framework-CFNetwork: . Lib/CFNetwork Modules PyObjCTest
[email protected] Tue, 29 Sep 2009 09:28:56 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Tue Sep 29 09:28:55 2009
New Revision: 2294
Log:
Update to SnowLeopard
Bump version
Modified:
trunk/pyobjc/pyobjc-framework-CFNetwork/Lib/CFNetwork/PyObjC.bridgesupport
trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/pyobjc-api.h
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhost.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfnetworkerrors.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfproxysupport.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfsocketstream.py
trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/Lib/CFNetwork/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/Lib/CFNetwork/PyObjC.bridgesupport (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/Lib/CFNetwork/PyObjC.bridgesupport Tue Sep 29 09:28:55 2009
@@ -9,6 +9,29 @@
<cftype name='CFNetServiceBrowserRef' type='^{__CFNetServiceBrowser=}' type64='^{__CFNetServiceBrowser=}' gettypeid_func='CFNetServiceBrowserGetTypeID'/>
<cftype name='CFNetServiceMonitorRef' type='^{__CFNetServiceMonitor=}' type64='^{__CFNetServiceMonitor=}' gettypeid_func='CFNetServiceMonitorGetTypeID'/>
<cftype name='CFNetServiceRef' type='^{__CFNetService=}' type64='^{__CFNetService=}' gettypeid_func='CFNetServiceGetTypeID'/>
+ <constant name='kCFStreamPropertySSLPeerCertificates' type='@' />
+ <constant name='kCFStreamPropertySSLPeerTrust' type='@' />
+ <constant name='kCFNetworkProxiesSOCKSEnable' type='@' />
+ <constant name='kCFNetworkProxiesSOCKSPort' type='@' />
+ <constant name='kCFNetworkProxiesSOCKSProxy' type='@' />
+ <constant name='kCFNetworkProxiesHTTPSEnable' type='@' />
+ <constant name='kCFNetworkProxiesHTTPSPort' type='@' />
+ <constant name='kCFNetworkProxiesHTTPSProxy' type='@' />
+ <constant name='kCFNetworkProxiesRTSPEnable' type='@' />
+ <constant name='kCFNetworkProxiesRTSPPort' type='@' />
+ <constant name='kCFNetworkProxiesRTSPProxy' type='@' />
+ <constant name='kCFNetworkProxiesFTPProxy' type='@' />
+ <constant name='kCFNetworkProxiesFTPPort' type='@' />
+ <constant name='kCFNetworkProxiesFTPPassive' type='@' />
+ <constant name='kCFNetworkProxiesFTPEnable' type='@' />
+ <constant name='kCFNetworkProxiesExcludeSimpleHostnames' type='@' />
+ <constant name='kCFNetworkProxiesExceptionsList' type='@' />
+ <constant name='kCFNetworkProxiesGopherEnable' type='@' />
+ <constant name='kCFNetworkProxiesGopherPort' type='@' />
+ <constant name='kCFNetworkProxiesGopherProxy' type='@' />
+ <constant name='kCFProxyAutoConfigurationHTTPResponseKey' type='@' />
+ <constant name='kCFURLErrorFailingURLErrorKey' type='@' />
+ <constant name='kCFURLErrorFailingURLStringErrorKey' type='@' />
<constant name='kCFStreamErrorDomainMach' type='i' />
<constant name='kCFStreamErrorDomainFTP' type='i' />
<constant name='kCFStreamErrorDomainSOCKS' type='i' />
@@ -134,6 +157,53 @@
<enum name='kCFErrorHTTPProxyConnectionFailure' value='306' />
<enum name='kCFErrorHTTPRedirectionLoopDetected' value='304' />
<enum name='kCFErrorPACFileError' value='308' />
+ <enum name='kCFErrorPACFileAuth' value='309' />
+ <enum name='kCFErrorHTTPSProxyConnectionFailure' value='310' />
+ <enum name='kCFURLErrorUnknown' value='-998' />
+ <enum name='kCFURLErrorCancelled' value='-999' />
+ <enum name='kCFURLErrorBadURL' value='-1000' />
+ <enum name='kCFURLErrorTimedOut' value='-1001' />
+ <enum name='kCFURLErrorUnsupportedURL' value='-1002' />
+ <enum name='kCFURLErrorCannotFindHost' value='-1003' />
+ <enum name='kCFURLErrorCannotConnectToHost' value='-1004' />
+ <enum name='kCFURLErrorNetworkConnectionLost' value='-1005' />
+ <enum name='kCFURLErrorDNSLookupFailed' value='-1006' />
+ <enum name='kCFURLErrorHTTPTooManyRedirects' value='-1007' />
+ <enum name='kCFURLErrorResourceUnavailable' value='-1008' />
+ <enum name='kCFURLErrorNotConnectedToInternet' value='-1009' />
+ <enum name='kCFURLErrorRedirectToNonExistentLocation' value='-1010' />
+ <enum name='kCFURLErrorBadServerResponse' value='-1011' />
+ <enum name='kCFURLErrorUserCancelledAuthentication' value='-1012' />
+ <enum name='kCFURLErrorUserAuthenticationRequired' value='-1013' />
+ <enum name='kCFURLErrorZeroByteResource' value='-1014' />
+ <enum name='kCFURLErrorCannotDecodeRawData' value='-1015' />
+ <enum name='kCFURLErrorCannotDecodeContentData' value='-1016' />
+ <enum name='kCFURLErrorCannotParseResponse' value='-1017' />
+ <enum name='kCFURLErrorInternationalRoamingOff' value='-1018' />
+ <enum name='kCFURLErrorCallIsActive' value='-1019' />
+ <enum name='kCFURLErrorDataNotAllowed' value='-1020' />
+ <enum name='kCFURLErrorRequestBodyStreamExhausted' value='-1021' />
+ <enum name='kCFURLErrorFileDoesNotExist' value='-1100' />
+ <enum name='kCFURLErrorFileIsDirectory' value='-1101' />
+ <enum name='kCFURLErrorNoPermissionsToReadFile' value='-1102' />
+ <enum name='kCFURLErrorDataLengthExceedsMaximum' value='-1103' />
+ <enum name='kCFURLErrorSecureConnectionFailed' value='-1200' />
+ <enum name='kCFURLErrorServerCertificateHasBadDate' value='-1201' />
+ <enum name='kCFURLErrorServerCertificateUntrusted' value='-1202' />
+ <enum name='kCFURLErrorServerCertificateHasUnknownRoot' value='-1203' />
+ <enum name='kCFURLErrorServerCertificateNotYetValid' value='-1204' />
+ <enum name='kCFURLErrorClientCertificateRejected' value='-1205' />
+ <enum name='kCFURLErrorClientCertificateRequired' value='-1206' />
+ <enum name='kCFURLErrorCannotLoadFromNetwork' value='-2000' />
+ <enum name='kCFURLErrorCannotCreateFile' value='-3000' />
+ <enum name='kCFURLErrorCannotOpenFile' value='-3001' />
+ <enum name='kCFURLErrorCannotCloseFile' value='-3002' />
+ <enum name='kCFURLErrorCannotWriteToFile' value='-3003' />
+ <enum name='kCFURLErrorCannotRemoveFile' value='-3004' />
+ <enum name='kCFURLErrorCannotMoveFile' value='-3005' />
+ <enum name='kCFURLErrorDownloadDecodingFailedMidStream' value='-3006' />
+ <enum name='kCFURLErrorDownloadDecodingFailedToComplete' value='-3007' />
+ <enum name='kCFHTTPCookieCannotParseCookieFile' value='-4000' />
<enum name='kCFFTPErrorUnexpectedStatusCode' value='200' />
<enum name='kCFHostAddresses' value='0' />
<enum name='kCFHostErrorHostNotFound' value='1' />
@@ -204,6 +274,9 @@
<enum name='kCFStreamSocketSecuritySSLv3' value='2' />
<enum name='kCFStreamSocketSecurityTLSv1' value='4' />
<enum name='kSOCKS5NoAcceptableMethod' value='255' />
+ <function name='CFNetworkCopySystemProxySettings'>
+ <retval type='^{__CFDictionary}' already_cfretained='true' />
+ </function>
<function name='CFFTPCreateParsedResourceListing'>
<retval type='l' type64='q' />
<arg type='^{__CFAllocator=}' />
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/pyobjc-api.h
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/pyobjc-api.h (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/pyobjc-api.h Tue Sep 29 09:28:55 2009
@@ -19,7 +19,7 @@
#include "Python.h"
#include <objc/objc.h>
-#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/Foundation.h>
#ifndef CGFLOAT_DEFINED
@@ -92,7 +92,7 @@
Py_BEGIN_ALLOW_THREADS \
@try {
-#define PyObjC_HANDLER } @catch(NSObject* _localException) { \
+#define PyObjC_HANDLER } @catch(volatile NSObject* _localException) { \
NSException* localException __attribute__((__unused__))= (NSException*)_localException;
#define PyObjC_ENDHANDLER \
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhost.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhost.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhost.py Tue Sep 29 09:28:55 2009
@@ -61,7 +61,7 @@
def callback(host, typeinfo, error, ctx):
lst.append([host, typeinfo, error, ctx])
- host = CFHostCreateWithName(None, u"www.python.org")
+ host = CFHostCreateWithName(None, u"localhost")
CFHostSetClient(host, callback, ctx)
rl = CFRunLoopGetCurrent()
@@ -72,7 +72,7 @@
self.failUnlessIsInstance(ok, bool)
self.failUnlessIsInstance(err, CFStreamError)
- CFRunLoopRunInMode(kCFRunLoopDefaultMode, 2.0, True)
+ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 4.0, True)
CFHostUnscheduleFromRunLoop(host, rl, kCFRunLoopDefaultMode)
self.failUnlessEqual(len(lst), 1)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfnetworkerrors.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfnetworkerrors.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfnetworkerrors.py Tue Sep 29 09:28:55 2009
@@ -15,6 +15,61 @@
self.failUnlessIsInstance(kCFDNSServiceFailureKey, unicode)
self.failUnlessIsInstance(kCFFTPStatusCodeKey, unicode)
+ @min_os_level('10.6')
+ def testConstants10_6(self):
+ self.failUnlessEqual(kCFErrorPACFileAuth, 309)
+ self.failUnlessEqual(kCFErrorHTTPSProxyConnectionFailure, 310)
+
+ self.failUnlessEqual(kCFURLErrorUnknown, -998)
+ self.failUnlessEqual(kCFURLErrorCancelled, -999)
+ self.failUnlessEqual(kCFURLErrorBadURL, -1000)
+ self.failUnlessEqual(kCFURLErrorTimedOut, -1001)
+ self.failUnlessEqual(kCFURLErrorUnsupportedURL, -1002)
+ self.failUnlessEqual(kCFURLErrorCannotFindHost, -1003)
+ self.failUnlessEqual(kCFURLErrorCannotConnectToHost, -1004)
+ self.failUnlessEqual(kCFURLErrorNetworkConnectionLost, -1005)
+ self.failUnlessEqual(kCFURLErrorDNSLookupFailed, -1006)
+ self.failUnlessEqual(kCFURLErrorHTTPTooManyRedirects, -1007)
+ self.failUnlessEqual(kCFURLErrorResourceUnavailable, -1008)
+ self.failUnlessEqual(kCFURLErrorNotConnectedToInternet, -1009)
+ self.failUnlessEqual(kCFURLErrorRedirectToNonExistentLocation, -1010)
+ self.failUnlessEqual(kCFURLErrorBadServerResponse, -1011)
+ self.failUnlessEqual(kCFURLErrorUserCancelledAuthentication, -1012)
+ self.failUnlessEqual(kCFURLErrorUserAuthenticationRequired, -1013)
+ self.failUnlessEqual(kCFURLErrorZeroByteResource, -1014)
+ self.failUnlessEqual(kCFURLErrorCannotDecodeRawData, -1015)
+ self.failUnlessEqual(kCFURLErrorCannotDecodeContentData, -1016)
+ self.failUnlessEqual(kCFURLErrorCannotParseResponse, -1017)
+ self.failUnlessEqual(kCFURLErrorInternationalRoamingOff, -1018)
+ self.failUnlessEqual(kCFURLErrorCallIsActive, -1019)
+ self.failUnlessEqual(kCFURLErrorDataNotAllowed, -1020)
+ self.failUnlessEqual(kCFURLErrorRequestBodyStreamExhausted, -1021)
+ self.failUnlessEqual(kCFURLErrorFileDoesNotExist, -1100)
+ self.failUnlessEqual(kCFURLErrorFileIsDirectory, -1101)
+ self.failUnlessEqual(kCFURLErrorNoPermissionsToReadFile, -1102)
+ self.failUnlessEqual(kCFURLErrorDataLengthExceedsMaximum, -1103)
+ self.failUnlessEqual(kCFURLErrorSecureConnectionFailed, -1200)
+ self.failUnlessEqual(kCFURLErrorServerCertificateHasBadDate, -1201)
+ self.failUnlessEqual(kCFURLErrorServerCertificateUntrusted, -1202)
+ self.failUnlessEqual(kCFURLErrorServerCertificateHasUnknownRoot, -1203)
+ self.failUnlessEqual(kCFURLErrorServerCertificateNotYetValid, -1204)
+ self.failUnlessEqual(kCFURLErrorClientCertificateRejected, -1205)
+ self.failUnlessEqual(kCFURLErrorClientCertificateRequired, -1206)
+ self.failUnlessEqual(kCFURLErrorCannotLoadFromNetwork, -2000)
+ self.failUnlessEqual(kCFURLErrorCannotCreateFile, -3000)
+ self.failUnlessEqual(kCFURLErrorCannotOpenFile, -3001)
+ self.failUnlessEqual(kCFURLErrorCannotCloseFile, -3002)
+ self.failUnlessEqual(kCFURLErrorCannotWriteToFile, -3003)
+ self.failUnlessEqual(kCFURLErrorCannotRemoveFile, -3004)
+ self.failUnlessEqual(kCFURLErrorCannotMoveFile, -3005)
+ self.failUnlessEqual(kCFURLErrorDownloadDecodingFailedMidStream, -3006)
+ self.failUnlessEqual(kCFURLErrorDownloadDecodingFailedToComplete, -3007)
+ self.failUnlessEqual(kCFHTTPCookieCannotParseCookieFile, -4000)
+
+ self.failUnlessIsInstance(kCFURLErrorFailingURLErrorKey, unicode)
+ self.failUnlessIsInstance(kCFURLErrorFailingURLStringErrorKey, unicode)
+
+
def testConstants(self):
self.failUnlessEqual(kCFHostErrorHostNotFound, 1)
self.failUnlessEqual(kCFHostErrorUnknown, 2)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfproxysupport.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfproxysupport.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfproxysupport.py Tue Sep 29 09:28:55 2009
@@ -117,6 +117,38 @@
self.failUnlessIsInstance(kCFNetworkProxiesProxyAutoConfigEnable, unicode)
self.failUnlessIsInstance(kCFNetworkProxiesProxyAutoConfigURLString, unicode)
+ @min_os_level('10.5')
+ @expectedFailure
+ def testConstants_fail(self):
+ self.failUnlessIsInstance(kCFProxyAutoConfigurationHTTPResponseKey, unicode)
+
+ @min_os_level('10.6')
+ def testFunctions10_6(self):
+ r = CFNetworkCopySystemProxySettings()
+ self.failUnlessIsInstance(r, CFDictionaryRef)
+
+ @min_os_level('10.6')
+ def testConstants10_6(self):
+ self.failUnlessIsInstance(kCFNetworkProxiesExceptionsList, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesExcludeSimpleHostnames, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesFTPEnable, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesFTPPassive, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesFTPPort, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesFTPProxy, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesGopherEnable, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesGopherPort, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesGopherProxy, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesHTTPSEnable, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesHTTPSPort, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesHTTPSProxy, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesRTSPEnable, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesRTSPPort, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesRTSPProxy, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesSOCKSEnable, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesSOCKSPort, unicode)
+ self.failUnlessIsInstance(kCFNetworkProxiesSOCKSProxy, unicode)
+
+
if __name__ == "__main__":
main()
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfsocketstream.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfsocketstream.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfsocketstream.py Tue Sep 29 09:28:55 2009
@@ -4,6 +4,9 @@
class TestCFSocketStream (TestCase):
def testConstants(self):
+ self.failUnlessIsInstance(kCFStreamPropertySSLPeerTrust, unicode)
+ self.failUnlessIsInstance(kCFStreamPropertySSLPeerCertificates, unicode)
+
self.failUnlessIsInstance(kCFStreamPropertySSLPeerCertificates, unicode)
self.failUnlessIsInstance(kCFStreamPropertySSLSettings, unicode)
self.failUnlessIsInstance(kCFStreamSSLLevel, unicode)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py Tue Sep 29 09:28:55 2009
@@ -30,7 +30,7 @@
setup(
name='pyobjc-framework-CFNetwork',
- version='2.2b3',
+ version='2.2b4',
description = "Wrappers for the framework CFNetwork on Mac OS X",
long_description = __doc__,
author='Ronald Oussoren',
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf