summaryrefslogtreecommitdiff
path: root/tests/test_session.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-04-22 02:33:32 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-04-22 02:33:32 +0200
commit916a56715c777e39461627ea564bc0625712c733 (patch)
treea58fb49cd65f9b7ff24029aeb4dfaccd657128dd /tests/test_session.py
parentd705a0524606c7b9b11f935de5a69d173c61ec0d (diff)
parent6c4ef4b3876812e6bbbb3e4748793997067aa85c (diff)
downloadpaste-git-916a56715c777e39461627ea564bc0625712c733.tar.gz
Merged in mfrobben/paste (pull request #21)
Fix bad reference to iterator variable
Diffstat (limited to 'tests/test_session.py')
-rw-r--r--tests/test_session.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/tests/test_session.py b/tests/test_session.py
index 621d284..b67bda5 100644
--- a/tests/test_session.py
+++ b/tests/test_session.py
@@ -1,5 +1,6 @@
from paste.session import SessionMiddleware
from paste.fixture import TestApp
+import six
info = []
@@ -12,9 +13,12 @@ def wsgi_app(environ, start_response):
if pi == '/get2':
sess = environ['paste.session.factory']()
if 'info' in sess:
- return [str(sess['info'])]
+ body = str(sess['info'])
+ if six.PY3:
+ body = body.encode('utf8')
+ return [body]
else:
- return ['no-info']
+ return [b'no-info']
if pi in ('/put1', '/put2'):
if pi == '/put1':
sess = environ['paste.session.factory']()
@@ -23,30 +27,30 @@ def wsgi_app(environ, start_response):
if pi == '/put2':
sess = environ['paste.session.factory']()
sess['info'] = info[0]
- return ['foo']
+ return [b'foo']
wsgi_app = SessionMiddleware(wsgi_app)
-
+
def test_app1():
app = TestApp(wsgi_app)
res = app.get('/get1')
- assert res.body == 'no-info'
+ assert res.body == b'no-info'
res = app.get('/get2')
- assert res.body == 'no-info'
+ assert res.body ==b'no-info'
info[:] = ['test']
res = app.get('/put1')
res = app.get('/get1')
- assert res.body == 'test'
+ assert res.body == b'test'
res = app.get('/get2')
- assert res.body == 'test'
+ assert res.body == b'test'
def test_app2():
app = TestApp(wsgi_app)
info[:] = ['fluff']
res = app.get('/put2')
res = app.get('/get1')
- assert res.body == 'fluff'
+ assert res.body == b'fluff'
res = app.get('/get2')
- assert res.body == 'fluff'
-
-
+ assert res.body == b'fluff'
+
+