[Zope3-checkins] CVS: Zope3/src/zope/proxy/context - context.py:1.1.2.2 wrapper.c:1.1.2.2 wrapper.h:1.1.2.2 setup.py:NONE

[Guido van Rossum]

Update of /cvs-repository/Zope3/src/zope/proxy/context
In directory cvs.zope.org:/tmp/cvs-serv32683/context

Modified Files:
      Tag: NameGeddon-branch
	context.py wrapper.c wrapper.h 
Removed Files:
      Tag: NameGeddon-branch
	setup.py 
Log Message:
Buncha renaming stuff; zope.proxy and zope.security now work.

=== Zope3/src/zope/proxy/context/context.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/proxy/context/context.py:1.1.2.1	Mon Dec 23 14:33:05 2002
+++ Zope3/src/zope/proxy/context/context.py	Mon Dec 23 15:17:47 2002
@@ -21,7 +21,7 @@
 
 from zope.security.proxy import Proxy, getChecker, getObject
 from zope.proxy.context import Wrapper as _Wrapper
-from zope.proxy.context import wrapperTypes, getobject, getdict
+from zope.proxy.context import getobject, getdict
 from zope.proxy.context import getcontext, getinnercontext, getinnerwrapper
 from zope.security.checker import defineChecker, selectChecker, BasicTypes
 
@@ -72,9 +72,6 @@
 def _contextWrapperChecker(ob):
     return selectChecker(getobject(ob))
 
-for wrapper_type in wrapperTypes:
-    defineChecker(wrapper_type, _contextWrapperChecker)
-
 def getWrapperData(_ob):
     if type(_ob) is Proxy:
         _ob = getObject(_ob)
@@ -247,6 +244,9 @@
 wrapperTypes = (SimpleMethodWrapper, SimpleCallableMethodWrapper,
                 SimpleGetitemMethodWrapper,
                 SimpleCallableGetitemMethodWrapper)
+
+for wrapper_type in wrapperTypes:
+    defineChecker(wrapper_type, _contextWrapperChecker)
 
 class ContextSuper:
 


=== Zope3/src/zope/proxy/context/wrapper.c 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/proxy/context/wrapper.c:1.1.2.1	Mon Dec 23 14:33:05 2002
+++ Zope3/src/zope/proxy/context/wrapper.c	Mon Dec 23 15:17:47 2002
@@ -1,8 +1,8 @@
 #include <Python.h>
 #include "modsupport.h"
-#include "Zope/Proxy/proxy.h"
+#include "zope/proxy/proxy.h"
 #define WRAPPER_MODULE
-#include "Zope/ContextWrapper/wrapper.h"
+#include "zope/proxy/context/wrapper.h"
 
 #define Wrapper_Check(wrapper)   (PyObject_TypeCheck(wrapper, &WrapperType))
 


=== Zope3/src/zope/proxy/context/wrapper.h 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/proxy/context/wrapper.h:1.1.2.1	Mon Dec 23 14:33:05 2002
+++ Zope3/src/zope/proxy/context/wrapper.h	Mon Dec 23 15:17:47 2002
@@ -10,7 +10,7 @@
 #define _wrapper_H_
 
 #ifndef _proxy_H_
-#include "Zope/Proxy/proxy.h"
+#include "zope/proxy/proxy.h"
 #endif
 
 typedef struct {

=== Removed File Zope3/src/zope/proxy/context/setup.py ===