[Zope3-checkins] CVS: Zope3/src/zope/context - __init__.py:1.13 containmentiterator.py:1.3 decorator.c:1.9 decorator.h:1.6 wrapper.c:1.17 wrapper.h:1.6

[Jim Fulton]

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

Modified Files:
	__init__.py containmentiterator.py decorator.c decorator.h 
	wrapper.c wrapper.h 
Log Message:
moved zope.proxy.context to zope.context

=== Zope3/src/zope/context/__init__.py 1.12 => 1.13 ===
--- Zope3/src/zope/context/__init__.py:1.12	Tue May 27 09:12:10 2003
+++ Zope3/src/zope/context/__init__.py	Tue May 27 10:18:29 2003
@@ -22,15 +22,15 @@
 
 from zope.interface import moduleProvides
 from zope.security.proxy import Proxy, getChecker, getObject
-from zope.proxy.context.wrapper import getobject, getdict, getdictcreate
-from zope.proxy.context.wrapper import getcontext, getinnercontext
-from zope.proxy.context.wrapper import getinnerwrapper, getbaseobject
-from zope.proxy.context.wrapper import ContextDescriptor, ContextAware
-from zope.proxy.context.wrapper import ContextMethod, ContextProperty
-from zope.proxy.context.wrapper import Wrapper
-from zope.proxy.context.decorator import Decorator
+from zope.context.wrapper import getobject, getdict, getdictcreate
+from zope.context.wrapper import getcontext, getinnercontext
+from zope.context.wrapper import getinnerwrapper, getbaseobject
+from zope.context.wrapper import ContextDescriptor, ContextAware
+from zope.context.wrapper import ContextMethod, ContextProperty
+from zope.context.wrapper import Wrapper
+from zope.context.decorator import Decorator
 from zope.security.checker import defineChecker, selectChecker, BasicTypes
-from zope.proxy.interfaces.context import IContextDecorator
+from zope.context.interfaces import IContextDecorator
 from zope.hookable import hookable
 
 moduleProvides(IContextDecorator)
@@ -157,8 +157,8 @@
 
 wrapperTypes = (Wrapper, Decorator)
 
-#defineChecker(Wrapper, _contextWrapperChecker)
-#defineChecker(Decorator, _contextWrapperChecker)
+defineChecker(Wrapper, _contextWrapperChecker)
+defineChecker(Decorator, _contextWrapperChecker)
 
 class ContextSuper:
 


=== Zope3/src/zope/context/containmentiterator.py 1.2 => 1.3 ===
--- Zope3/src/zope/context/containmentiterator.py:1.2	Wed Dec 25 09:15:16 2002
+++ Zope3/src/zope/context/containmentiterator.py	Tue May 27 10:18:29 2003
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from zope.proxy.context import Wrapper, wrapperTypes, getinnercontext
+from zope.context import Wrapper, wrapperTypes, getinnercontext
 
 class ContainmentIterator:
 


=== Zope3/src/zope/context/decorator.c 1.8 => 1.9 ===
--- Zope3/src/zope/context/decorator.c:1.8	Mon May 12 12:17:39 2003
+++ Zope3/src/zope/context/decorator.c	Tue May 27 10:18:29 2003
@@ -2,9 +2,9 @@
 #include "structmember.h"
 #include "modsupport.h"
 #include "zope/proxy/proxy.h"
-#include "zope/proxy/context/wrapper.h"
+#include "zope/context/wrapper.h"
 #define DECORATOR_MODULE
-#include "zope/proxy/context/decorator.h"
+#include "zope/context/decorator.h"
 
 /* XXX perhaps all these wrapper args should be renamed to decorator? */
 #define Decorator_Check(wrapper)  (PyObject_TypeCheck(wrapper, &DecoratorType))


=== Zope3/src/zope/context/decorator.h 1.5 => 1.6 ===
--- Zope3/src/zope/context/decorator.h:1.5	Mon May 12 10:59:36 2003
+++ Zope3/src/zope/context/decorator.h	Tue May 27 10:18:29 2003
@@ -9,7 +9,7 @@
 #define _decorator_H_
 
 #ifndef _wrapper_H_
-#include "zope/proxy/context/wrapper.h"
+#include "zope/context/wrapper.h"
 #endif
 
 typedef struct {
@@ -46,7 +46,7 @@
 Decorator_Import(void)
 {
     if (_decorator_api == NULL) {
-        PyObject *m = PyImport_ImportModule("zope.proxy.context.decorator");
+        PyObject *m = PyImport_ImportModule("zope.context.decorator");
         if (m != NULL) {
             PyObject *tmp = PyObject_GetAttrString(m, "_CAPI");
             if (tmp != NULL) {


=== Zope3/src/zope/context/wrapper.c 1.16 => 1.17 ===
--- Zope3/src/zope/context/wrapper.c:1.16	Mon May 12 12:17:39 2003
+++ Zope3/src/zope/context/wrapper.c	Tue May 27 10:18:29 2003
@@ -3,7 +3,7 @@
 #include "modsupport.h"
 #include "zope/proxy/proxy.h"
 #define WRAPPER_MODULE
-#include "zope/proxy/context/wrapper.h"
+#include "zope/context/wrapper.h"
 
 #define Wrapper_Check(wrapper)   (PyObject_TypeCheck(wrapper, &WrapperType))
 


=== Zope3/src/zope/context/wrapper.h 1.5 => 1.6 ===
--- Zope3/src/zope/context/wrapper.h:1.5	Thu May  8 05:39:21 2003
+++ Zope3/src/zope/context/wrapper.h	Tue May 27 10:18:29 2003
@@ -51,7 +51,7 @@
 Wrapper_Import(void)
 {
     if (_wrapper_api == NULL) {
-        PyObject *m = PyImport_ImportModule("zope.proxy.context.wrapper");
+        PyObject *m = PyImport_ImportModule("zope.context.wrapper");
         if (m != NULL) {
             PyObject *tmp = PyObject_GetAttrString(m, "_CAPI");
             if (tmp != NULL) {