summaryrefslogtreecommitdiff
path: root/py/modules/IcePy
diff options
context:
space:
mode:
Diffstat (limited to 'py/modules/IcePy')
-rw-r--r--py/modules/IcePy/Communicator.cpp20
-rw-r--r--py/modules/IcePy/ImplicitContext.cpp309
-rw-r--r--py/modules/IcePy/ImplicitContext.h27
-rw-r--r--py/modules/IcePy/Init.cpp5
-rw-r--r--py/modules/IcePy/Makefile1
-rwxr-xr-xpy/modules/IcePy/Makefile.mak1
6 files changed, 363 insertions, 0 deletions
diff --git a/py/modules/IcePy/Communicator.cpp b/py/modules/IcePy/Communicator.cpp
index 2871800a2a3..caf3d9f2cea 100644
--- a/py/modules/IcePy/Communicator.cpp
+++ b/py/modules/IcePy/Communicator.cpp
@@ -12,6 +12,7 @@
#endif
#include <IceUtil/DisableWarnings.h>
#include <Communicator.h>
+#include <ImplicitContext.h>
#include <Logger.h>
#include <ObjectAdapter.h>
#include <ObjectFactory.h>
@@ -727,6 +728,23 @@ communicatorGetDefaultContext(CommunicatorObject* self)
extern "C"
#endif
static PyObject*
+communicatorGetImplicitContext(CommunicatorObject* self)
+{
+ Ice::ImplicitContextPtr implicitContext = (*self->communicator)->getImplicitContext();
+
+ if(implicitContext == 0)
+ {
+ return 0;
+ }
+
+ return createImplicitContext(implicitContext);
+}
+
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
communicatorCreateObjectAdapter(CommunicatorObject* self, PyObject* args)
{
char* name;
@@ -1027,6 +1045,8 @@ static PyMethodDef CommunicatorMethods[] =
PyDoc_STR(STRCAST("setDefaultContext(ctx) -> None")) },
{ STRCAST("getDefaultContext"), (PyCFunction)communicatorGetDefaultContext, METH_NOARGS,
PyDoc_STR(STRCAST("getDefaultContext() -> Ice.Context")) },
+ { STRCAST("getImplicitContext"), (PyCFunction)communicatorGetImplicitContext, METH_NOARGS,
+ PyDoc_STR(STRCAST("getImplicitContext() -> Ice.ImplicitContext")) },
{ STRCAST("getProperties"), (PyCFunction)communicatorGetProperties, METH_NOARGS,
PyDoc_STR(STRCAST("getProperties() -> Ice.Properties")) },
{ STRCAST("getLogger"), (PyCFunction)communicatorGetLogger, METH_NOARGS,
diff --git a/py/modules/IcePy/ImplicitContext.cpp b/py/modules/IcePy/ImplicitContext.cpp
new file mode 100644
index 00000000000..6b8411f816c
--- /dev/null
+++ b/py/modules/IcePy/ImplicitContext.cpp
@@ -0,0 +1,309 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifdef _WIN32
+# include <IceUtil/Config.h>
+#endif
+#include <ImplicitContext.h>
+#include <ObjectAdapter.h>
+#include <Proxy.h>
+#include <Util.h>
+#include <Ice/ImplicitContext.h>
+
+using namespace std;
+using namespace IcePy;
+
+namespace IcePy
+{
+
+extern PyTypeObject ImplicitContextType;
+
+struct ImplicitContextObject
+{
+ PyObject_HEAD
+ Ice::ImplicitContextPtr* implicitContext;
+};
+
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static ImplicitContextObject*
+implicitContextNew(PyObject* /*arg*/)
+{
+ ImplicitContextObject* self = PyObject_New(ImplicitContextObject, &ImplicitContextType);
+ if (self == NULL)
+ {
+ return NULL;
+ }
+ self->implicitContext = 0;
+ return self;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static void
+implicitContextDealloc(ImplicitContextObject* self)
+{
+ delete self->implicitContext;
+ PyObject_Del(self);
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static int
+implicitContextCompare(ImplicitContextObject* c1, ImplicitContextObject* c2)
+{
+ if(*c1->implicitContext < *c2->implicitContext)
+ {
+ return -1;
+ }
+ else if(*c1->implicitContext == *c2->implicitContext)
+ {
+ return 0;
+ }
+ else
+ {
+ return 1;
+ }
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextGetContext(ImplicitContextObject* self)
+{
+ Ice::Context ctx = (*self->implicitContext)->getContext();
+
+ PyObjectHandle dict = PyDict_New();
+ if(dict.get() == NULL)
+ {
+ return NULL;
+ }
+
+ if(!contextToDictionary(ctx, dict.get()))
+ {
+ return NULL;
+ }
+
+ return dict.release();
+}
+
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextSetContext(ImplicitContextObject* self, PyObject* args)
+{
+ PyObject* dict;
+ if(!PyArg_ParseTuple(args, STRCAST("O!"), &PyDict_Type, &dict))
+ {
+ return NULL;
+ }
+
+ Ice::Context ctx;
+ if(!dictionaryToContext(dict, ctx))
+ {
+ return NULL;
+ }
+
+ (*self->implicitContext)->setContext(ctx);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextGet(ImplicitContextObject* self, PyObject* args)
+{
+ char* key;
+ if(!PyArg_ParseTuple(args, STRCAST("s"), &key))
+ {
+ return NULL;
+ }
+
+ string val;
+ try
+ {
+ val = (*self->implicitContext)->get(key);
+ }
+ catch(const Ice::Exception& ex)
+ {
+ setPythonException(ex);
+ return NULL;
+ }
+ return PyString_FromString(const_cast<char*>(val.c_str()));
+}
+
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextGetWithDefault(ImplicitContextObject* self, PyObject* args)
+{
+ char* key;
+ char* dflt;
+ if(!PyArg_ParseTuple(args, STRCAST("ss"), &key, &dflt))
+ {
+ return NULL;
+ }
+
+ string val = (*self->implicitContext)->getWithDefault(key, dflt);
+ return PyString_FromString(const_cast<char*>(val.c_str()));
+}
+
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextSet(ImplicitContextObject* self, PyObject* args)
+{
+ char* key;
+ char* val;
+ if(!PyArg_ParseTuple(args, STRCAST("ss"), &key, &val))
+ {
+ return NULL;
+ }
+
+ (*self->implicitContext)->set(key, val);
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+#ifdef WIN32
+extern "C"
+#endif
+static PyObject*
+implicitContextRemove(ImplicitContextObject* self, PyObject* args)
+{
+ char* key;
+ if(!PyArg_ParseTuple(args, STRCAST("s"), &key))
+ {
+ return NULL;
+ }
+
+ try
+ {
+ (*self->implicitContext)->remove(key);
+ }
+ catch(const Ice::Exception& ex)
+ {
+ setPythonException(ex);
+ return NULL;
+ }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+static PyMethodDef ImplicitContextMethods[] =
+{
+ { STRCAST("getContext"), (PyCFunction)implicitContextGetContext, METH_VARARGS,
+ PyDoc_STR(STRCAST("getContext() -> Ice.Context")) },
+ { STRCAST("setContext"), (PyCFunction)implicitContextSetContext, METH_VARARGS,
+ PyDoc_STR(STRCAST("setContext(ctx) -> None")) },
+ { STRCAST("get"), (PyCFunction)implicitContextGet, METH_VARARGS,
+ PyDoc_STR(STRCAST("get(key) -> string")) },
+ { STRCAST("getWithDefault"), (PyCFunction)implicitContextGetWithDefault, METH_VARARGS,
+ PyDoc_STR(STRCAST("getWithDefault(key, defaultValue) -> string")) },
+ { STRCAST("set"), (PyCFunction)implicitContextSet, METH_VARARGS,
+ PyDoc_STR(STRCAST("set(key, value) -> None")) },
+ { STRCAST("remove"), (PyCFunction)implicitContextRemove, METH_VARARGS,
+ PyDoc_STR(STRCAST("remove(key) -> None")) },
+ { NULL, NULL} /* sentinel */
+};
+
+namespace IcePy
+{
+
+PyTypeObject ImplicitContextType =
+{
+ /* The ob_type field must be initialized in the module init function
+ * to be portable to Windows without using C++. */
+ PyObject_HEAD_INIT(NULL)
+ 0, /* ob_size */
+ STRCAST("IcePy.ImplicitContext"), /* tp_name */
+ sizeof(ImplicitContextObject), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ /* methods */
+ (destructor)implicitContextDealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ (cmpfunc)implicitContextCompare, /* tp_compare */
+ 0, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ 0, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT, /* tp_flags */
+ 0, /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ 0, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ ImplicitContextMethods, /* tp_methods */
+ 0, /* tp_members */
+ 0, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ (newfunc)implicitContextNew, /* tp_new */
+ 0, /* tp_free */
+ 0, /* tp_is_gc */
+};
+
+}
+
+bool
+IcePy::initImplicitContext(PyObject* module)
+{
+ if(PyType_Ready(&ImplicitContextType) < 0)
+ {
+ return false;
+ }
+ if(PyModule_AddObject(module, STRCAST("ImplicitContext"), (PyObject*)&ImplicitContextType) < 0)
+ {
+ return false;
+ }
+
+ return true;
+}
+
+PyObject*
+IcePy::createImplicitContext(const Ice::ImplicitContextPtr& implicitContext)
+{
+ ImplicitContextObject* obj = implicitContextNew(NULL);
+ if(obj != NULL)
+ {
+ obj->implicitContext = new Ice::ImplicitContextPtr(implicitContext);
+ }
+ return (PyObject*)obj;
+}
diff --git a/py/modules/IcePy/ImplicitContext.h b/py/modules/IcePy/ImplicitContext.h
new file mode 100644
index 00000000000..12363473128
--- /dev/null
+++ b/py/modules/IcePy/ImplicitContext.h
@@ -0,0 +1,27 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEPY_IMPLICIT_CONTEXT_H
+#define ICEPY_IMPLICIT_CONTEXT_H
+
+#include <Config.h>
+#include <Ice/ImplicitContext.h>
+
+namespace IcePy
+{
+
+extern PyTypeObject ImplicitContextType;
+
+bool initImplicitContext(PyObject*);
+
+PyObject* createImplicitContext(const Ice::ImplicitContextPtr&);
+
+}
+
+#endif
diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp
index 58eb87d84c4..d70b9d85f02 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/py/modules/IcePy/Init.cpp
@@ -13,6 +13,7 @@
#include <Communicator.h>
#include <Connection.h>
#include <Current.h>
+#include <ImplicitContext.h>
#include <Logger.h>
#include <ObjectAdapter.h>
#include <Operation.h>
@@ -123,4 +124,8 @@ initIcePy(void)
{
return;
}
+ if(!initImplicitContext(module))
+ {
+ return;
+ }
}
diff --git a/py/modules/IcePy/Makefile b/py/modules/IcePy/Makefile
index b24c6c63626..53ad6e883a4 100644
--- a/py/modules/IcePy/Makefile
+++ b/py/modules/IcePy/Makefile
@@ -18,6 +18,7 @@ TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(li
OBJS = Communicator.o \
Connection.o \
Current.o \
+ ImplicitContext.o \
Init.o \
Logger.o \
ObjectAdapter.o \
diff --git a/py/modules/IcePy/Makefile.mak b/py/modules/IcePy/Makefile.mak
index 50a3776076c..943e304e357 100755
--- a/py/modules/IcePy/Makefile.mak
+++ b/py/modules/IcePy/Makefile.mak
@@ -17,6 +17,7 @@ TARGETS = $(LIBNAME) $(DLLNAME)
OBJS = Communicator.obj \
Connection.obj \
Current.obj \
+ ImplicitContext.obj \
Init.obj \
Logger.obj \
ObjectAdapter.obj \
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 21:31:14 +0000