diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2015-09-03 21:40:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-09-21 10:19:22 +0200 |
| commit | 59c4b6f03b3dbea2d0dd9064b0118aa18e80a6c9 (patch) | |
| tree | e8f885d790cd7b7ab19b87ba3279ae0e5cffde3b /patches/flup6-1.1 | |
| parent | 0d3ed18d9eb083c9c6cafbe73f201cacd21ec125 (diff) | |
| download | ptxdist-59c4b6f03b3dbea2d0dd9064b0118aa18e80a6c9.tar.gz ptxdist-59c4b6f03b3dbea2d0dd9064b0118aa18e80a6c9.tar.xz | |
flup6: new package
Flup6 does also support python3.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/flup6-1.1')
| -rw-r--r-- | patches/flup6-1.1/0001-fcgi_base-make-python3-aware.patch | 36 | ||||
| -rw-r--r-- | patches/flup6-1.1/series | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/patches/flup6-1.1/0001-fcgi_base-make-python3-aware.patch b/patches/flup6-1.1/0001-fcgi_base-make-python3-aware.patch new file mode 100644 index 000000000..b89be92a2 --- /dev/null +++ b/patches/flup6-1.1/0001-fcgi_base-make-python3-aware.patch @@ -0,0 +1,36 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Wed, 9 Sep 2015 19:47:54 +0200 +Subject: [PATCH] fcgi_base: make python3 aware + +When run with python3, we get this error: + +Traceback (most recent call last): + File "/usr/lib/python3.4/site-packages/flup/server/fcgi_base.py", line 567, in run + File "/usr/lib/python3.4/site-packages/flup/server/fcgi_base.py", line 1066, in handler + File "/usr/lib/python3.4/site-packages/flup/server/fcgi_base.py", line 1177, in _sanitizeEnv +TypeError: 'str' does not support the buffer interface + +This commit was found in upstream commit 3af8659 and was backported to flup6 +revision 1.1. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- + flup/server/fcgi_base.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/flup/server/fcgi_base.py b/flup/server/fcgi_base.py +index 08e5701f0db5..455613220a93 100644 +--- a/flup/server/fcgi_base.py ++++ b/flup/server/fcgi_base.py +@@ -1172,9 +1172,9 @@ class BaseFCGIServer(object): + ('SERVER_PORT', '80'), + ('SERVER_PROTOCOL', 'HTTP/1.0')]: + if name not in environ: +- environ['wsgi.errors'].write('%s: missing FastCGI param %s ' ++ environ['wsgi.errors'].write(bytearray('%s: missing FastCGI param %s ' + 'required by WSGI!\n' % +- (self.__class__.__name__, name)) ++ (self.__class__.__name__, name), 'utf')) + environ[name] = default + + def error(self, req): diff --git a/patches/flup6-1.1/series b/patches/flup6-1.1/series new file mode 100644 index 000000000..2c1607493 --- /dev/null +++ b/patches/flup6-1.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-fcgi_base-make-python3-aware.patch +# da176db62c36ae5c7e5bb6331c5b6ba9 - git-ptx-patches magic |