diff options
author | roberto@mrspurr <roberto@mrspurr> | 2012-04-05 05:52:58 +0200 |
---|---|---|
committer | roberto@mrspurr <roberto@mrspurr> | 2012-04-05 05:52:58 +0200 |
commit | 14c558559bb682ec1d35aa8aa95a2a9d45559558 (patch) | |
tree | 4a10e7761598ddcd9923f7397f61a3dc5e1002fe | |
parent | 92c5dcb6f2d85dc8ac590133241725ef37e35a2c (diff) | |
download | uwsgi-14c558559bb682ec1d35aa8aa95a2a9d45559558.tar.gz |
pypy now has PyFile_FromFile
-rw-r--r-- | plugins/python/wsgi_subhandler.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/python/wsgi_subhandler.c b/plugins/python/wsgi_subhandler.c index b6dfd1e0..9f4453ea 100644 --- a/plugins/python/wsgi_subhandler.c +++ b/plugins/python/wsgi_subhandler.c @@ -50,15 +50,11 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_ // if async_post is mapped as a file, directly use it as wsgi.input if (wsgi_req->async_post) { -#ifdef UWSGI_PYPY - uwsgi_log("wsgi.input mapped to a file is not supported under PyPy\n"); -#else #ifdef PYTHREE wsgi_req->async_input = PyFile_FromFd(fileno(wsgi_req->async_post), "wsgi_input", "rb", 0, NULL, NULL, NULL, 0); #else wsgi_req->async_input = PyFile_FromFile(wsgi_req->async_post, "wsgi_input", "r", NULL); #endif -#endif } else { // create wsgi.input custom object @@ -87,11 +83,9 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_ PyDict_SetItemString(wsgi_req->async_environ, "wsgi.version", wi->gateway_version); -#ifndef UWSGI_PYPY zero = PyFile_FromFile(stderr, "wsgi_errors", "w", NULL); PyDict_SetItemString(wsgi_req->async_environ, "wsgi.errors", zero); Py_DECREF(zero); -#endif PyDict_SetItemString(wsgi_req->async_environ, "wsgi.run_once", Py_False); @@ -131,11 +125,9 @@ void *uwsgi_request_subhandler_wsgi(struct wsgi_request *wsgi_req, struct uwsgi_ wsgi_req->async_app = wi->callable; // export .env only in non-threaded mode -#ifndef UWSGI_PYPY if (uwsgi.threads < 2) { PyDict_SetItemString(up.embedded_dict, "env", wsgi_req->async_environ); } -#endif PyDict_SetItemString(wsgi_req->async_environ, "uwsgi.version", wi->uwsgi_version); |