Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.1
fontforge
fontforge.py27.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fontforge.py27.diff of Package fontforge
diff -ru fontforge-20090923.orig/fontforge/ffpython.h fontforge-20090923/fontforge/ffpython.h --- fontforge-20090923.orig/fontforge/ffpython.h 2009-08-06 01:33:51.000000000 +0200 +++ fontforge-20090923/fontforge/ffpython.h 2010-09-06 10:51:46.003385009 +0200 @@ -60,11 +60,11 @@ #define _PyBytes_Eq _PyString_Eq #define PyBytes_Format PyString_Format #define _PyBytes_FormatLong _PyString_FormatLong -#define PyBytes_DecodeEscape PyString_DecodeEscape +#define PyString_DecodeEscape PyString_DecodeEscape #define _PyBytes_Join _PyString_Join -#define PyBytes_Decode PyString_Decode +#define PyString_Decode PyString_Decode #define PyBytes_Encode PyString_Encode -#define PyBytes_AsEncodedObject PyString_AsEncodedObject +#define PyString_AsEncodedObject PyString_AsEncodedObject #define PyBytes_AsEncodedString PyString_AsEncodedString #define PyBytes_AsDecodedObject PyString_AsDecodedObject #define PyBytes_AsDecodedString PyString_AsDecodedString diff -ru fontforge-20090923.orig/fontforge/python.c fontforge-20090923/fontforge/python.c --- fontforge-20090923.orig/fontforge/python.c 2009-09-12 14:43:32.000000000 +0200 +++ fontforge-20090923/fontforge/python.c 2010-09-06 10:51:46.062259025 +0200 @@ -742,7 +742,7 @@ Py_XINCREF(glyph); PyTuple_SetItem(arglist,0,py_ie[ie_index].data); PyTuple_SetItem(arglist,1,glyph); - PyTuple_SetItem(arglist,2,PyBytes_Decode(filename,strlen(filename),"UTF-8",NULL)); + PyTuple_SetItem(arglist,2,PyString_Decode(filename,strlen(filename),"UTF-8",NULL)); PyTuple_SetItem(arglist,3,Py_BuildValue("i",toback)); result = PyEval_CallObject(py_ie[ie_index].import, arglist); Py_DECREF(arglist); @@ -765,7 +765,7 @@ Py_XINCREF(glyph); PyTuple_SetItem(arglist,0,py_ie[ie_index].data); PyTuple_SetItem(arglist,1,glyph); - PyTuple_SetItem(arglist,2,PyBytes_Decode(filename,strlen(filename),"UTF-8",NULL)); + PyTuple_SetItem(arglist,2,PyString_Decode(filename,strlen(filename),"UTF-8",NULL)); result = PyEval_CallObject(py_ie[ie_index].export, arglist); Py_DECREF(arglist); Py_XDECREF(result); @@ -882,7 +882,7 @@ free(def); if ( ret==NULL ) Py_RETURN_NONE; - reto = PyBytes_Decode(ret,strlen(ret),"UTF-8",NULL); + reto = PyString_Decode(ret,strlen(ret),"UTF-8",NULL); free(ret); return( reto ); } @@ -905,7 +905,7 @@ free(def); if ( ret==NULL ) Py_RETURN_NONE; - reto = PyBytes_Decode(ret,strlen(ret),"UTF-8",NULL); + reto = PyString_Decode(ret,strlen(ret),"UTF-8",NULL); free(ret); return( reto ); } @@ -937,7 +937,7 @@ return( NULL ); } for ( i=0; i<cnt; ++i ) { - PyObject *utf8_name = PyBytes_AsEncodedObject(PyTuple_GetItem(answero,i), + PyObject *utf8_name = PyString_AsEncodedObject(PyTuple_GetItem(answero,i), "UTF-8",NULL); if ( utf8_name==NULL ) return( NULL ); @@ -977,7 +977,7 @@ return( NULL ); } for ( i=0; i<cnt; ++i ) { - PyObject *utf8_name = PyBytes_AsEncodedObject(PySequence_GetItem(answero,i), + PyObject *utf8_name = PyString_AsEncodedObject(PySequence_GetItem(answero,i), "UTF-8",NULL); if ( utf8_name==NULL ) return( NULL ); diff -ru fontforge-20090923.orig/fontforge/pythonui.c fontforge-20090923/fontforge/pythonui.c --- fontforge-20090923.orig/fontforge/pythonui.c 2009-08-06 01:33:53.000000000 +0200 +++ fontforge-20090923/fontforge/pythonui.c 2010-09-06 10:51:46.066259158 +0200 @@ -228,7 +228,7 @@ shortcut_str = PyBytes_AsString(PyTuple_GetItem(args,4)); for ( i=5; i<cnt; ++i ) { - PyObject *submenu_utf8 = PyBytes_AsEncodedObject(PyTuple_GetItem(args,i), + PyObject *submenu_utf8 = PyString_AsEncodedObject(PyTuple_GetItem(args,i), "UTF-8",NULL); unichar_t *submenuu = utf82u_copy( PyBytes_AsString(submenu_utf8) ); Py_DECREF(submenu_utf8); @@ -305,7 +305,7 @@ return( NULL ); } for ( i=5; i<cnt; ++i ) { - utf8_name = PyBytes_AsEncodedObject(PyTuple_GetItem(args,i), + utf8_name = PyString_AsEncodedObject(PyTuple_GetItem(args,i), "UTF-8",NULL); if ( utf8_name==NULL ) return( NULL );
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
