summaryrefslogtreecommitdiff
path: root/wsgitools
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2010-08-31 12:31:51 +0200
committerHelmut Grohne <helmut@subdivi.de>2010-08-31 12:31:51 +0200
commit73e958a9b2ca244a6e7ec4e85ef91327425d8aba (patch)
tree841dd9a753db98d6e444f7edb518876eeb033103 /wsgitools
parent55492002da9f49e4eb4ee94ab73e232546f0c45f (diff)
downloadwsgitools-73e958a9b2ca244a6e7ec4e85ef91327425d8aba.tar.gz
bugfix: io module from py2.6 provides incompatible StringIO
Diffstat (limited to 'wsgitools')
-rw-r--r--wsgitools/filters.py9
-rw-r--r--wsgitools/middlewares.py9
-rw-r--r--wsgitools/scgi/asynchronous.py9
3 files changed, 12 insertions, 15 deletions
diff --git a/wsgitools/filters.py b/wsgitools/filters.py
index 8f4f6a5..7062357 100644
--- a/wsgitools/filters.py
+++ b/wsgitools/filters.py
@@ -10,13 +10,12 @@ __all__ = []
import sys
import time
import gzip
+# Cannot use io module as it is broken in 2.6.
+# Writing a str to a io.StringIO results in an exception.
try:
- import io
+ import cStringIO as io
except ImportError:
- try:
- import cStringIO as io
- except ImportError:
- import StringIO as io
+ import StringIO as io
try:
next
diff --git a/wsgitools/middlewares.py b/wsgitools/middlewares.py
index 38e2e67..09d4cfe 100644
--- a/wsgitools/middlewares.py
+++ b/wsgitools/middlewares.py
@@ -5,13 +5,12 @@ import sys
import cgitb
import binascii
from wsgitools.filters import CloseableList, CloseableIterator
+# Cannot use io module as it is broken in 2.6.
+# Writing a str to a io.StringIO results in an exception.
try:
- import io
+ import cStringIO as io
except ImportError:
- try:
- import cStringIO as io
- except ImportError:
- import StringIO as io
+ import StringIO as io
try:
next
except NameError:
diff --git a/wsgitools/scgi/asynchronous.py b/wsgitools/scgi/asynchronous.py
index b51e7ca..ecc27fb 100644
--- a/wsgitools/scgi/asynchronous.py
+++ b/wsgitools/scgi/asynchronous.py
@@ -3,13 +3,12 @@ __all__ = []
import asyncore
import socket
import sys
+# Cannot use io module as it is broken in 2.6.
+# Writing a str to a io.StringIO results in an exception.
try:
- import io
+ import cStringIO as io
except ImportError:
- try:
- import cStringIO as io
- except ImportError:
- import StringIO as io
+ import StringIO as io
class SCGIConnection(asyncore.dispatcher):
"""SCGI connection class used by L{SCGIServer}."""