[Zope-Checkins] CVS: Zope/lib/python/AccessControl - cAccessControl.c:1.10.12.2

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv28818

Modified Files:
      Tag: cAccessControl-review-branch
	cAccessControl.c 
Log Message:
import hack. don't look.


=== Zope/lib/python/AccessControl/cAccessControl.c 1.10.12.1 => 1.10.12.2 ===
 */
 
-static int 
-ZopeSecurityPolicy_setup(void) {
-	PyObject *module;
-
 #define IMPORT(module, name) if ((module = PyImport_ImportModule(name)) == NULL) return -1;
 #define GETATTR(module, name) if ((name = PyObject_GetAttrString(module, #name)) == NULL) return -1;
 
-	/*| from SimpleObjectPolicies import Containers
-	*/
-
-	IMPORT(module, "AccessControl.SimpleObjectPolicies");
-	GETATTR(module, Containers);
-	Py_DECREF(module);
-	module = NULL;
-
-	/*| from AccessControl import Unauthorized
-	*/
-
-	IMPORT(module, "AccessControl");
-	GETATTR(module, Unauthorized);
-	Py_DECREF(module);
-	module = NULL;
+static int 
+ZopeSecurityPolicy_setup(void) {
+	PyObject *module;
 
 	/*| from zLOG import LOG, PROBLEM
 	*/
@@ -1558,6 +1542,20 @@
 	PyExtensionClass_Export(dict, "imPermissionRole",
 		imPermissionRoleType);
 
-	imPermissionRoleObj = PyDict_GetItemString(dict, "imPermissionRole");
+	/*| from SimpleObjectPolicies import Containers
+	*/
+
+	IMPORT(module, "AccessControl.SimpleObjectPolicies");
+	GETATTR(module, Containers);
+	Py_DECREF(module);
+	module = NULL;
+
+	/*| from AccessControl import Unauthorized
+	*/
+
+	IMPORT(module, "AccessControl");
+	GETATTR(module, Unauthorized);
+	Py_DECREF(module);
+	module = NULL;
 }