diff options
| author | Michael Merickel <michael@merickel.org> | 2015-08-31 10:24:27 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-08-31 10:24:27 -0500 |
| commit | b02228c4b5b047a35d000033152f723c80353084 (patch) | |
| tree | b26d420efe9370232242b079ba56974acefe1abe | |
| parent | e0a230a8006c11097469510c47a84fd9b107b748 (diff) | |
| parent | 10dd6084ff6ee3fd96e56a7a14f301855dc6f89f (diff) | |
| download | pyramid-b02228c4b5b047a35d000033152f723c80353084.tar.gz pyramid-b02228c4b5b047a35d000033152f723c80353084.tar.bz2 pyramid-b02228c4b5b047a35d000033152f723c80353084.zip | |
Merge branch 'fixes/cookie_values' of bertjwregeer/pyramid into pull.1866
| -rw-r--r-- | pyramid/tests/test_session.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyramid/tests/test_session.py b/pyramid/tests/test_session.py index b013ffa66..2fd764e5e 100644 --- a/pyramid/tests/test_session.py +++ b/pyramid/tests/test_session.py @@ -1,3 +1,4 @@ +import base64 import json import unittest from pyramid import testing @@ -277,7 +278,7 @@ class TestBaseCookieSession(SharedCookieSessionTests, unittest.TestCase): return BaseCookieSessionFactory(serializer, **kw)(request) def _serialize(self, value): - return json.dumps(value) + return base64.b64encode(json.dumps(value).encode('utf-8')) def test_reissue_not_triggered(self): import time @@ -650,10 +651,10 @@ class Test_check_csrf_token(unittest.TestCase): class DummySerializer(object): def dumps(self, value): - return json.dumps(value).encode('utf-8') + return base64.b64encode(json.dumps(value).encode('utf-8')) def loads(self, value): - return json.loads(value.decode('utf-8')) + return json.loads(base64.b64decode(value).decode('utf-8')) class DummySessionFactory(dict): _dirty = False |
