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/pygoptioncontext.c | |
| 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/pygoptioncontext.c')
| -rw-r--r-- | glib/pygoptioncontext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/pygoptioncontext.c b/glib/pygoptioncontext.c index 50a52fa..a180565 100644 --- a/glib/pygoptioncontext.c +++ b/glib/pygoptioncontext.c @@ -97,7 +97,7 @@ pyg_option_context_parse(PyGOptionContext *self, for (pos = 0; pos < argv_length; pos++) { arg = PyList_GetItem(argv, pos); - argv_content[pos] = g_strdup(PyString_AsString(arg)); + argv_content[pos] = g_strdup(_PyUnicode_AsString(arg)); if (argv_content[pos] == NULL) { g_strfreev(argv_content); @@ -125,7 +125,7 @@ pyg_option_context_parse(PyGOptionContext *self, new_argv = PyList_New(g_strv_length(argv_content)); for (pos = 0; pos < argv_length; pos++) { - arg = PyString_FromString(argv_content[pos]); + arg = _PyUnicode_FromString(argv_content[pos]); PyList_SetItem(new_argv, pos, arg); } |