Reused normalise_param_structure

Author: MarkusH

laterpay/utils.py

@@ -1,13 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function
-
 import time
 
-import six
 from six.moves.urllib.parse import urlencode
 
 from laterpay import signing
-from laterpay.compat import stringify
 
 
 def signed_query(secret,
@@ -40,17 +36,12 @@ def signed_query(secret,
 
     :return: url-encoded and signed query string
     """
+    params = signing.normalise_param_structure(params)
+
     if "ts" not in params and add_timestamp:
         params["ts"] = str(int(time.time()))
 
-    param_list = [
-        (
-            stringify(key), [stringify(v) for v in val]
-            if isinstance(val, (list, tuple))
-            else stringify(val)
-        )
-        for key, val in six.iteritems(params)
-    ]
+    param_list = list(params.items())
 
     qs = urlencode(param_list, doseq=True)
 

tests/test_utils.py

@@ -56,6 +56,20 @@ def test_signed_query_added_timestamp(self, time_time_mock):
         self.assertEqual(qsd['ts'], ['123'])
         self.assertEqual(qsd['foo'], ['bar'])
 
+    @mock.patch('time.time')
+    def test_signed_query_added_timestamp_params_not_dict(self, time_time_mock):
+        time_time_mock.return_value = 123
+
+        params = [('foo', 'bar')]
+        url = 'https://endpoint.com/api'
+        secret = 'secret'
+
+        qs = utils.signed_query(secret, params, url)
+        qsd = parse_qs(qs)
+
+        self.assertEqual(qsd['ts'], ['123'])
+        self.assertEqual(qsd['foo'], ['bar'])
+
     def test_signed_url(self):
         params = {'foo': 'bar'}
         url = utils.signed_url(