diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-10-07 18:08:47 +0100 |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-10-07 18:08:47 +0100 |
| commit | 5dc2997c7fb9686073c29e760f79c9df3ada0ba0 (patch) | |
| tree | 03932fc4a2b6660f5df6fd19c94d0ad117d92b59 /Modules/_multiprocessing/multiprocessing.c | |
| parent | d8dc55408edfe94e6c3d667bd0414ff66310c481 (diff) | |
| download | cpython-5dc2997c7fb9686073c29e760f79c9df3ada0ba0.tar.gz | |
Get rid of circular import and eliminate unprefixed exported symbols
from _multiprocessing.
Diffstat (limited to 'Modules/_multiprocessing/multiprocessing.c')
| -rw-r--r-- | Modules/_multiprocessing/multiprocessing.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c index eb05c62b0d..110eff710e 100644 --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -10,14 +10,12 @@ #include "multiprocessing.h" -PyObject *ProcessError, *BufferTooShort; - /* * Function which raises exceptions based on error codes */ PyObject * -mp_SetError(PyObject *Type, int num) +_PyMp_SetError(PyObject *Type, int num) { switch (num) { #ifdef MS_WINDOWS @@ -159,19 +157,12 @@ PyInit__multiprocessing(void) if (!module) return NULL; - /* Get copy of BufferTooShort */ - temp = PyImport_ImportModule("multiprocessing"); - if (!temp) - return NULL; - BufferTooShort = PyObject_GetAttrString(temp, "BufferTooShort"); - Py_XDECREF(temp); - #if defined(MS_WINDOWS) || \ (defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)) - /* Add SemLock type to module */ - if (PyType_Ready(&SemLockType) < 0) + /* Add _PyMp_SemLock type to module */ + if (PyType_Ready(&_PyMp_SemLockType) < 0) return NULL; - Py_INCREF(&SemLockType); + Py_INCREF(&_PyMp_SemLockType); { PyObject *py_sem_value_max; /* Some systems define SEM_VALUE_MAX as an unsigned value that @@ -182,10 +173,10 @@ PyInit__multiprocessing(void) py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX); if (py_sem_value_max == NULL) return NULL; - PyDict_SetItemString(SemLockType.tp_dict, "SEM_VALUE_MAX", + PyDict_SetItemString(_PyMp_SemLockType.tp_dict, "SEM_VALUE_MAX", py_sem_value_max); } - PyModule_AddObject(module, "SemLock", (PyObject*)&SemLockType); + PyModule_AddObject(module, "SemLock", (PyObject*)&_PyMp_SemLockType); #endif /* Add configuration macros */ |