From 656de924eba441e45c07116916338da8bf4a782d Mon Sep 17 00:00:00 2001 From: Unbit Date: Tue, 2 Jul 2013 16:19:12 +0200 Subject: [PATCH] fixed latin1 encoding with python3 --- plugins/python/uwsgi_pymodule.c | 2 +- plugins/python/wsgi_headers.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/python/uwsgi_pymodule.c b/plugins/python/uwsgi_pymodule.c index fc96709b..e633d53d 100644 --- a/plugins/python/uwsgi_pymodule.c +++ b/plugins/python/uwsgi_pymodule.c @@ -819,7 +819,7 @@ PyObject *py_uwsgi_advanced_sendfile(PyObject * self, PyObject * args) { } #ifdef PYTHREE else if (PyUnicode_Check(what)) { - filename = PyBytes_AsString(PyUnicode_AsASCIIString(what)); + filename = PyBytes_AsString(PyUnicode_AsLatin1String(what)); fd = open(filename, O_RDONLY); if (fd < 0) { diff --git a/plugins/python/wsgi_headers.c b/plugins/python/wsgi_headers.c index 231b2f48..0fd5a60d 100644 --- a/plugins/python/wsgi_headers.c +++ b/plugins/python/wsgi_headers.c @@ -61,7 +61,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { PyObject *zero = NULL; PyObject *zero2 = NULL; if (self != Py_None) { - zero = PyUnicode_AsASCIIString(head); + zero = PyUnicode_AsLatin1String(head); if (!zero) { return PyErr_Format(PyExc_TypeError, "http status string must be encodable in latin1"); } @@ -135,7 +135,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { #ifdef PYTHREE if (self != Py_None) { - zero = PyUnicode_AsASCIIString(h_key); + zero = PyUnicode_AsLatin1String(h_key); if (!zero) { return PyErr_Format(PyExc_TypeError, "http header must be encodable in latin1"); } @@ -153,7 +153,7 @@ PyObject *py_uwsgi_spit(PyObject * self, PyObject * args) { #ifdef PYTHREE if (self != Py_None) { - zero2 = PyUnicode_AsASCIIString(h_value); + zero2 = PyUnicode_AsLatin1String(h_value); if (!zero2) { return PyErr_Format(PyExc_TypeError, "http header must be encodable in latin1"); }