[Zope3-checkins] CVS: Zope3/src/zope/security - _proxy.c:1.4 proxy.py:1.7

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/security
In directory cvs.zope.org:/tmp/cvs-serv12475/src/zope/security

Modified Files:
	_proxy.c proxy.py 
Log Message:
Now getObject comes from zope.proxy


=== Zope3/src/zope/security/_proxy.c 1.3 => 1.4 ===
--- Zope3/src/zope/security/_proxy.c:1.3	Fri Feb  7 15:16:35 2003
+++ Zope3/src/zope/security/_proxy.c	Wed May 28 11:49:26 2003
@@ -852,21 +852,6 @@
 };
 
 static PyObject *
-module_getObject(PyObject *self, PyObject *arg)
-{
-	PyObject *result;
-
-	if (!Proxy_Check(arg)) {
-		PyErr_SetString(PyExc_TypeError,
-				"getObject argument must be a _Proxy");
-		return NULL;
-	}
-	result = Proxy_GetObject(arg);
-	Py_INCREF(result);
-	return result;
-}
-
-static PyObject *
 module_getChecker(PyObject *self, PyObject *arg)
 {
 	PyObject *result;
@@ -883,7 +868,6 @@
 
 static PyMethodDef
 module_functions[] = {
-	{"getObject", module_getObject, METH_O, "get object from proxy"},
 	{"getChecker", module_getChecker, METH_O, "get checker from proxy"},
 	{NULL}
 };


=== Zope3/src/zope/security/proxy.py 1.6 => 1.7 ===
--- Zope3/src/zope/security/proxy.py:1.6	Wed May 28 08:55:28 2003
+++ Zope3/src/zope/security/proxy.py	Wed May 28 11:49:27 2003
@@ -16,7 +16,8 @@
 $Id$
 """
 
-from zope.security._proxy import getObject, getChecker
+from zope.proxy import getObject
+from zope.security._proxy import getChecker
 from zope.security._proxy import _Proxy as Proxy
 from zope.security.checker import TrustedCheckerBase