diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-03 09:34:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-04 08:55:11 +0200 |
| commit | 982820640865addb921e32b26d9aae3c3b3a10d7 (patch) | |
| tree | 90defd570a1371b35af5fdbcd1d6b3767e32d79e | |
| parent | 70c8b4567fc6a5ccb8fb5a6bdcbc26f267f5af4d (diff) | |
Demystify magic ponies
Change-Id: I7e619daf8743d3471ece72d81f6cf1bb61741646
| -rw-r--r-- | pyuno/qa/pytests/insertremovecells.py | 2 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_module.cxx | 4 | ||||
| -rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pyuno/qa/pytests/insertremovecells.py b/pyuno/qa/pytests/insertremovecells.py index 4ce2707602bc..0c9626caa7d2 100644 --- a/pyuno/qa/pytests/insertremovecells.py +++ b/pyuno/qa/pytests/insertremovecells.py @@ -14,7 +14,7 @@ class InsertRemoveCells(unittest.TestCase): @classmethod def setUpClass(cls): cls.xContext = pyuno.getComponentContext() - pyuno.experimentalExtraMagic() + pyuno.private_initTestEnvironment() # no need for a tearDown(cls) method. diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index eeb039aac843..23800ee0c3be 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -319,7 +319,7 @@ static PyObject* getComponentContext( return ret.getAcquired(); } -static PyObject* initPoniesMode( +static PyObject* initTestEnvironment( SAL_UNUSED_PARAMETER PyObject*, SAL_UNUSED_PARAMETER PyObject*) { // this tries to bootstrap enough of the soffice from python to run @@ -841,7 +841,7 @@ static PyObject *setCurrentContext( struct PyMethodDef PyUNOModule_methods [] = { - {"experimentalExtraMagic", initPoniesMode, METH_VARARGS, NULL}, + {"private_initTestEnvironment", initTestEnvironment, METH_VARARGS, NULL}, {"getComponentContext", getComponentContext, METH_VARARGS, NULL}, {"_createUnoStructHelper", reinterpret_cast<PyCFunction>(createUnoStructHelper), METH_VARARGS | METH_KEYWORDS, NULL}, {"getTypeByName", getTypeByName, METH_VARARGS, NULL}, diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 3da77ffdbd3e..6a7f8143cdd2 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -175,7 +175,7 @@ class UnoInProcess: return self.xDoc def setUp(self): self.xContext = pyuno.getComponentContext() - pyuno.experimentalExtraMagic() + pyuno.private_initTestEnvironment() def openEmptyWriterDoc(self): assert(self.xContext) smgr = self.getContext().ServiceManager |