diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-07-26 14:04:48 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-07-26 14:04:48 +0000 |
| commit | 130e20efbdc32e7b49960f24fac59c04fb613f87 (patch) | |
| tree | cc42b8c6c917ae1924756d43f37d567a7752bf1f /glib/pyglib-python-compat.h | |
| parent | 73bb2db55342c2b5e22ad87e14903c92352932b4 (diff) | |
| download | pygobject-130e20efbdc32e7b49960f24fac59c04fb613f87.tar.gz pygobject-130e20efbdc32e7b49960f24fac59c04fb613f87.tar.xz pygobject-130e20efbdc32e7b49960f24fac59c04fb613f87.zip | |
Also export PyInit_glib import glib._glib instead of just _glib
2008-07-26 Johan Dahlin <johan@gnome.org>
* glib/Makefile.am:
Also export PyInit_glib
* glib/__init__.py:
import glib._glib instead of just _glib
* glib/pyglib-python-compat.h:
* glib/pygoptioncontext.c (pyg_option_context_parse):
* glib/pygsource.c (source_repr), (pyg_source_attach),
(pyg_source_get_priority), (pyg_source_set_priority),
(pyg_source_get_id), (pyg_source_prepare), (pyg_poll_fd_repr):
* glib/pygspawn.c (pyg_pid_close), (pyg_pid_free), (pyg_pid_new),
(pyglib_spawn_async), (pyglib_spawn_register_types):
Go over the rest and replace missing symbols on python3.
the glib module successfully compiles and runs now.
svn path=/trunk/; revision=874
Diffstat (limited to 'glib/pyglib-python-compat.h')
| -rw-r--r-- | glib/pyglib-python-compat.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/glib/pyglib-python-compat.h b/glib/pyglib-python-compat.h index ccf2b85..b7a1970 100644 --- a/glib/pyglib-python-compat.h +++ b/glib/pyglib-python-compat.h @@ -55,12 +55,16 @@ PyTypeObject symbol = { \ #define _PyUnicode_AsStringAndSize PyString_AsStringAndSize #define _PyUnicode_FromString PyString_FromString #define _PyUnicode_FromStringAndSize PyString_FromStringAndSize +#define _PyUnicode_FromFormat PyString_FromFormat #define _PyUnicode_AS_STRING PyString_AS_STRING #define _PyUnicode_GET_SIZE PyString_GET_SIZE #define _PyUnicode_Resize _PyString_Resize #define _PyLong_Check PyInt_Check #define _PyLong_FromLong PyInt_FromLong #define _PyLong_AsLong PyInt_AsLong +#define RO READONLY +#define _PyLongObject PyIntObject +#define _PyLong_Type PyInt_Type #else #define PYGLIB_MODULE_START(symbol, modname) \ static struct PyModuleDef _##symbol##module = { \ @@ -99,12 +103,15 @@ PyTypeObject symbol = { \ #define _PyUnicode_AsStringAndSize(obj, buf, size) PyUnicode_AsStringAndSize(obj, size) #define _PyUnicode_FromString PyUnicode_FromString #define _PyUnicode_FromStringAndSize PyUnicode_FromStringAndSize +#define _PyUnicode_FromFormat PyUnicode_FromFormat #define _PyUnicode_AS_STRING _PyUnicode_AsString #define _PyUnicode_GET_SIZE PyUnicode_GET_SIZE #define _PyUnicode_Resize PyUnicode_Resize #define _PyLong_Check PyLong_Check #define _PyLong_FromLong PyLong_FromLong #define _PyLong_AsLong PyLong_AsLong +#define _PyLongObject PyLongObject +#define _PyLong_Type PyLong_Type #endif #endif /* __PYGLIB_PYTHON_COMPAT_H__ */ |