[PyObjC-svn] r2429 - in trunk/pyobjc/pyobjc-framework-CFNetwork: Modules PyObjCTest

Author: ronaldoussoren
Date: Sun Apr  4 05:17:31 2010
New Revision: 2429

Log:
- Fix testcase error
- Convert to new macros


Modified:
   trunk/pyobjc/pyobjc-framework-CFNetwork/Modules/_manual.m
   trunk/pyobjc/pyobjc-framework-CFNetwork/PyObjCTest/test_cfproxysupport.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	Sun Apr  4 05:17:31 2010
@@ -325,67 +325,31 @@
 	{ 0, 0, 0, }
 };
 
-#if PY_MAJOR_VERSION == 3
-
-static struct PyModuleDef mod_module = {
-	PyModuleDef_HEAD_INIT,
-	"_manual",
-	NULL,
-	0,
-	mod_methods,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-#define INITERROR() return NULL
-#define INITDONE() return m
-
-PyObject* PyInit__manual(void);
-
-PyObject*
-PyInit__manual(void)
-
-#else
-
-#define INITERROR() return
-#define INITDONE() return
-
-
-
-void init_manual(void);
-void init_manual(void)
-#endif
+PyObjC_MODULE_INIT(_manual)
 {
 	PyObject* m;
 
-#if PY_MAJOR_VERSION == 3
-	m = PyModule_Create(&mod_module);
-#else
-	m = Py_InitModule4("_manual", mod_methods,
-		NULL, NULL, PYTHON_API_VERSION);
-#endif
+	m = PyObjC_MODULE_CREATE(_manual)
 	if (!m) {
-		INITERROR();
+		PyObjC_INITERROR();
 	}
 
         if (PyObjC_ImportAPI(m) < 0) { 
-		INITERROR();
+		PyObjC_INITERROR();
 	}
 
 #if PyObjC_BUILD_RELEASE >= 1005
 	if (CFNetworkExecuteProxyAutoConfigurationScript == NULL) {
 		if (PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationScript") < 0) {
-			INITERROR();
+			PyObjC_INITERROR();
 		}
 	}
 	if (CFNetworkExecuteProxyAutoConfigurationURL == NULL) {
 		if (PyDict_DelItemString(m, "CFNetworkExecuteProxyAutoConfigurationURL") < 0) {
-			INITERROR();
+			PyObjC_INITERROR();
 		}
 	}
 #endif
 
-	INITDONE();
+	PyObjC_INITDONE();
 }

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	Sun Apr  4 05:17:31 2010
@@ -120,6 +120,7 @@
     @expectedFailure
     @min_os_level('10.5')
     def testConstants_fail(self):
+        self.assertIsIn('kCFProxyAutoConfigurationHTTPResponseKey', globals())
         self.assertIsInstance(kCFProxyAutoConfigurationHTTPResponseKey, unicode)
 
     @min_os_level('10.6')

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev