[PyObjC-svn] r2493 - in trunk/pyobjc/pyobjc-framework-SystemConfiguration: . Modules PyObjCTest

Author: ronaldoussoren
Date: Thu Jun 10 19:10:36 2010
New Revision: 2493

Log:
Fix small issues


Modified:
   trunk/pyobjc/pyobjc-framework-SystemConfiguration/Modules/_manual.m
   trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scnetworkconfiguration.py
   trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scpreferences.py
   trunk/pyobjc/pyobjc-framework-SystemConfiguration/distribute_setup.py

Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/Modules/_manual.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/Modules/_manual.m	(original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/Modules/_manual.m	Thu Jun 10 19:10:36 2010
@@ -491,8 +491,6 @@
 }
 
 
-PyDoc_STRVAR(mod_doc, "");
-
 static PyMethodDef mod_methods[] = {
 	{ 
 		"SCDynamicStoreCreate", 

Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scnetworkconfiguration.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scnetworkconfiguration.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scnetworkconfiguration.py	Thu Jun 10 19:10:36 2010
@@ -188,7 +188,7 @@
         self.assertTrue(isinstance(iface, SCVLANInterfaceRef))
 
         r = SCVLANInterfaceGetPhysicalInterface(iface)
-        self.assertTrue(r is a[0])
+        self.assertEqual(r, a[0])
 
         t = SCVLANInterfaceGetTag(iface)
         self.assertEquals(t, 99)
@@ -197,13 +197,13 @@
         self.assertTrue(t is None or isinstance(t, CFDictionaryRef))
 
         r = SCVLANInterfaceSetPhysicalInterfaceAndTag(iface, a[0], 42)
-        self.assertTrue(r is True)
+        self.assertIs(r, True)
 
         r = SCVLANInterfaceSetLocalizedDisplayName(iface, "octest")
-        self.assertTrue(r is True)
+        self.assertIs(r, True)
 
         r = SCVLANInterfaceSetOptions(iface, {"name": "foo"})
-        self.assertTrue(r is True)
+        self.assertIs(r, True)
 
         t = SCVLANInterfaceGetOptions(iface)
         self.assertTrue(isinstance(t, CFDictionaryRef))

Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scpreferences.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scpreferences.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/PyObjCTest/test_scpreferences.py	Thu Jun 10 19:10:36 2010
@@ -76,6 +76,7 @@
 
 
 
+    @expectedFailure
     def testSecurityIntegreation(self):
         self.fail("Need Security framework wrappers")
         #aref = SFAuthorization.authorization().authorizationRef ()

Modified: trunk/pyobjc/pyobjc-framework-SystemConfiguration/distribute_setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-SystemConfiguration/distribute_setup.py	(original)
+++ trunk/pyobjc/pyobjc-framework-SystemConfiguration/distribute_setup.py	Thu Jun 10 19:10:36 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