summaryrefslogtreecommitdiff
path: root/cherrypy/lib/encoding.py
diff options
context:
space:
mode:
Diffstat (limited to 'cherrypy/lib/encoding.py')
-rw-r--r--cherrypy/lib/encoding.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/cherrypy/lib/encoding.py b/cherrypy/lib/encoding.py
index d5886af1..287228dc 100644
--- a/cherrypy/lib/encoding.py
+++ b/cherrypy/lib/encoding.py
@@ -1,4 +1,8 @@
try:
+ from cStringIO import StringIO
+except ImportError:
+ from StringIO import StringIO
+try:
set
except NameError:
from sets import Set as set
@@ -197,7 +201,6 @@ def compress(body, compress_level):
def decompress(body):
import gzip
- from cherrypy.py3util import StringIO
zbuf = StringIO()
zbuf.write(body)