[PyObjC-svn] r2344 - in trunk/pyobjc/pyobjc-framework-CFNetwork: . Modules PyObjCTest
[email protected] Tue, 13 Oct 2009 09:04:57 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Tue Oct 13 09:04:57 2009
New Revision: 2344
Log:
Ensure tests work on 10.4
Modified:
trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/_manual.m
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhost.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpauthentication.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpmessage.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpstream.py
trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfsocketstream.py
trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/_manual.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/_manual.m (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/_manual.m Tue Oct 13 09:04:57 2009
@@ -37,6 +37,7 @@
0
};
+#if PyObjC_BUILD_RELEASE >= 1005
static void
m_CFProxyAutoConfigurationResultCallback(void* _context, CFArrayRef proxyList, CFErrorRef error)
{
@@ -70,6 +71,7 @@
PyGILState_Release(state);
}
+#endif
static void
m_CFHostClientCallBack(CFHostRef host, CFHostInfoType typeInfo, const CFStreamError* error, void* _context)
@@ -114,6 +116,7 @@
}
+#if PyObjC_BUILD_RELEASE >= 1005
static PyObject*
m_CFNetworkExecuteProxyAutoConfigurationScript(PyObject* mod __attribute__((__unused__)),
PyObject* args)
@@ -229,6 +232,7 @@
return rv;
}
+#endif /* OSX 10.5 */
static PyObject*
m_CFHostSetClient(PyObject* mod __attribute__((__unused__)),
@@ -294,7 +298,9 @@
}
+
static PyMethodDef m_methods[] = {
+#if PyObjC_BUILD_RELEASE >= 1005
{
"CFNetworkExecuteProxyAutoConfigurationScript",
(PyCFunction)m_CFNetworkExecuteProxyAutoConfigurationScript,
@@ -307,6 +313,8 @@
METH_VARARGS,
NULL
},
+#endif /* OSX >= 10.5 */
+
{
"CFHostSetClient",
(PyCFunction)m_CFHostSetClient,
@@ -324,4 +332,13 @@
NULL, NULL, PYTHON_API_VERSION);
if (PyObjC_ImportAPI(m) < 0) { return; }
+
+#if PyObjC_BUILD_RELEASE >= 1005
+ if (CFNetworkExecuteProxyAutoConfigurationScript == NULL) {
+ PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationScript");
+ }
+ if (CFNetworkExecuteProxyAutoConfigurationURL == NULL) {
+ PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationURL");
+ }
+#endif
}
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 Oct 13 09:04:57 2009
@@ -89,6 +89,5 @@
self.failUnlessIsInstance(ok, bool)
-
if __name__ == "__main__":
main()
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpauthentication.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpauthentication.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpauthentication.py Tue Oct 13 09:04:57 2009
@@ -16,6 +16,8 @@
self.failUnlessIsInstance(kCFHTTPAuthenticationPassword, unicode)
self.failUnlessIsInstance(kCFHTTPAuthenticationAccountDomain, unicode)
+ @min_os_level('10.5')
+ #These functions should work on 10.4 as well, but caue a crash in CFNetwork on that platform
def testFunctions(self):
self.failUnlessIsInstance(CFHTTPAuthenticationGetTypeID(), (int, long))
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpmessage.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpmessage.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpmessage.py Tue Oct 13 09:04:57 2009
@@ -2,13 +2,17 @@
from PyObjCTools.TestSupport import *
class TestCFHTTPMessage (TestCase):
+
+ @min_os_level('10.5')
+ def testConstants10_5(self):
+ self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeNTLM, unicode)
+ self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeNegotiate, unicode)
+
def testConstants(self):
self.failUnlessIsInstance(kCFHTTPVersion1_0, unicode)
self.failUnlessIsInstance(kCFHTTPVersion1_1, unicode)
self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeBasic, unicode)
self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeDigest, unicode)
- self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeNTLM, unicode)
- self.failUnlessIsInstance(kCFHTTPAuthenticationSchemeNegotiate, unicode)
def testTypes(self):
self.failUnlessIsCFType(CFHTTPMessageRef)
@@ -88,7 +92,7 @@
self.failUnlessResultIsBOOL(CFHTTPMessageAddAuthentication)
self.failUnlessArgIsBOOL(CFHTTPMessageAddAuthentication, 5)
- v = CFHTTPMessageAddAuthentication(req, resp, u"ronald", u"secret", kCFHTTPAuthenticationSchemeNTLM, False)
+ v = CFHTTPMessageAddAuthentication(req, resp, u"ronald", u"secret", kCFHTTPAuthenticationSchemeBasic, False)
self.failUnlessIsInstance(v, bool)
v = CFHTTPMessageGetResponseStatusCode(resp)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpstream.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpstream.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfhttpstream.py Tue Oct 13 09:04:57 2009
@@ -3,6 +3,10 @@
import os
class TestCFHTTPStream (TestCase):
+ @min_os_level('10.5')
+ def testConstants10_5(self):
+ self.failUnlessIsInstance(kCFStreamPropertyHTTPFinalRequest, unicode)
+
def testConstants(self):
self.failUnlessEqual(kCFStreamErrorHTTPParseFailure, -1)
self.failUnlessEqual(kCFStreamErrorHTTPRedirectionLoop, -2)
@@ -10,7 +14,6 @@
self.failUnlessIsInstance(kCFStreamPropertyHTTPResponseHeader, unicode)
self.failUnlessIsInstance(kCFStreamPropertyHTTPFinalURL, unicode)
- self.failUnlessIsInstance(kCFStreamPropertyHTTPFinalRequest, unicode)
self.failUnlessIsInstance(kCFStreamPropertyHTTPProxy, unicode)
self.failUnlessIsInstance(kCFStreamPropertyHTTPProxyHost, unicode)
self.failUnlessIsInstance(kCFStreamPropertyHTTPProxyPort, unicode)
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 Oct 13 09:04:57 2009
@@ -3,8 +3,12 @@
class TestCFSocketStream (TestCase):
- def testConstants(self):
+ @min_os_level('10.5')
+ def testConstants10_5(self):
self.failUnlessIsInstance(kCFStreamPropertySSLPeerTrust, unicode)
+ self.failUnlessIsInstance(kCFStreamErrorDomainWinSock, (int, long))
+
+ def testConstants(self):
self.failUnlessIsInstance(kCFStreamPropertySSLPeerCertificates, unicode)
self.failUnlessIsInstance(kCFStreamPropertySSLPeerCertificates, unicode)
@@ -17,7 +21,6 @@
self.failUnlessIsInstance(kCFStreamSSLPeerName, unicode)
self.failUnlessIsInstance(kCFStreamSSLCertificates, unicode)
self.failUnlessIsInstance(kCFStreamSSLIsServer, unicode)
- self.failUnlessIsInstance(kCFStreamErrorDomainWinSock, (int, long))
self.failUnlessIsInstance(kCFStreamErrorDomainSOCKS, (int, long))
self.failUnlessEqual(kCFStreamErrorSOCKSSubDomainNone, 0)
Modified: trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py (original)
+++ trunk/pyobjc/pyobjc-framework-CFNetwork/setup.py Tue Oct 13 09:04:57 2009
@@ -28,6 +28,12 @@
else:
CFLAGS=[]
+import platform
+CFLAGS.append(
+ "-DPyObjC_BUILD_RELEASE=%02d%02d"%(tuple(map(int, platform.mac_ver()[0].split('.')[:2])))
+)
+
+
setup(
name='pyobjc-framework-CFNetwork',
version='2.2b4',
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) 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/devconference