From 8093218e8ca543c3631a18032b4fff902a845c0d Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 23 Nov 2010 12:30:38 +0200 Subject: Permit unicode paths in rpm.fd() (RhBug:654145) - Python 3 has fs-specific converter function, for Python 2 just assume utf-8 and hope the best. --- python/rpmfd-py.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'python/rpmfd-py.c') diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c index acd8f7279..9819e14d7 100644 --- a/python/rpmfd-py.c +++ b/python/rpmfd-py.c @@ -42,6 +42,17 @@ static PyObject *err_closed(void) return NULL; } +static FD_t openPath(const char *path, const char *mode, const char *flags) +{ + FD_t fd; + char *m = rstrscat(NULL, mode, ".", flags, NULL); + Py_BEGIN_ALLOW_THREADS + fd = Fopen(path, m); + Py_END_ALLOW_THREADS; + free(m); + return fd; +} + static PyObject *rpmfd_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds) { @@ -58,11 +69,21 @@ static PyObject *rpmfd_new(PyTypeObject *subtype, return NULL; if (PyBytes_Check(fo)) { - char *m = rstrscat(NULL, mode, ".", flags, NULL); - Py_BEGIN_ALLOW_THREADS - fd = Fopen(PyBytes_AsString(fo), m); - Py_END_ALLOW_THREADS - free(m); + fd = openPath(PyBytes_AsString(fo), mode, flags); + } else if (PyUnicode_Check(fo)) { + PyObject *enc = NULL; + int rc; +#if PY_MAJOR_VERSION >= 3 + rc = PyUnicode_FSConverter(fo, &enc); +#else + rc = utf8FromPyObject(fo, &enc); +#endif + if (rc == 0) + return NULL; + + fd = openPath(PyBytes_AsString(enc), mode, flags); + Py_DECREF(enc); + } else if ((fdno = PyObject_AsFileDescriptor(fo)) >= 0) { fd = fdDup(fdno); } else { -- cgit v1.2.3