summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/static.py2
-rw-r--r--pyramid/tests/test_static.py8
2 files changed, 8 insertions, 2 deletions
diff --git a/pyramid/static.py b/pyramid/static.py
index 34fc3f55c..0cbb5533f 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -223,7 +223,7 @@ class QueryStringCacheBuster(Md5AssetTokenGenerator):
if isinstance(query, dict):
query[self.param] = token
else:
- kw['_query'] = query + [(self.param, token)]
+ kw['_query'] = tuple(query) + ((self.param, token),)
return subpath, kw
diff --git a/pyramid/tests/test_static.py b/pyramid/tests/test_static.py
index aca5c4bbd..134bea25e 100644
--- a/pyramid/tests/test_static.py
+++ b/pyramid/tests/test_static.py
@@ -471,7 +471,13 @@ class TestQueryStringCacheBuster(unittest.TestCase):
fut = self._makeOne().pregenerate
self.assertEqual(
fut('foo', ('bar',), {'_query': [('a', 'b')]}),
- (('bar',), {'_query': [('a', 'b'), ('x', 'foo')]}))
+ (('bar',), {'_query': (('a', 'b'), ('x', 'foo'))}))
+
+ def test_pregenerate_query_is_tuple_of_tuples(self):
+ fut = self._makeOne().pregenerate
+ self.assertEqual(
+ fut('foo', ('bar',), {'_query': (('a', 'b'),)}),
+ (('bar',), {'_query': (('a', 'b'), ('x', 'foo'))}))
class DummyContext:
pass