Make twilio.util.ScopeURI param string have a consistent ordering.

ftobia · ftobia · commit 15a5069ecfa9 · 2013-04-05T15:53:38.000-04:00
Update tests accordingly.
This makes the test suite pass consistently on Python 3.3
diff --git a/tests/test_jwt.py b/tests/test_jwt.py
@@ -46,7 +46,7 @@ def test_outbound_permissions_params(self):
         token.allow_client_outgoing("AP123", foobar=3)
         payload = token.payload()
 
-        eurl = "scope:client:outgoing?appSid=AP123&appParams=foobar%3D3"
+        eurl = "scope:client:outgoing?appParams=foobar%3D3&appSid=AP123"
         self.assertEquals(payload["scope"], eurl)
 
     def test_events(self):
@@ -62,7 +62,7 @@ def test_events_with_filters(self):
         token.allow_event_stream(foobar="hey")
         payload = token.payload()
 
-        event_uri = "scope:stream:subscribe?path=%2F2010-04-01%2FEvents&params=foobar%3Dhey"
+        event_uri = "scope:stream:subscribe?params=foobar%3Dhey&path=%2F2010-04-01%2FEvents"
         self.assertEquals(payload["scope"], event_uri)
 
     def test_decode(self):
@@ -71,7 +71,7 @@ def test_decode(self):
         token.allow_client_incoming("andy")
         token.allow_event_stream()
 
-        outgoing_uri = "scope:client:outgoing?appSid=AP123&appParams=foobar%3D3&clientName=andy"
+        outgoing_uri = "scope:client:outgoing?appParams=foobar%3D3&appSid=AP123&clientName=andy"
         incoming_uri = "scope:client:incoming?clientName=andy"
         event_uri = "scope:stream:subscribe?path=%2F2010-04-01%2FEvents"
 
diff --git a/twilio/util.py b/twilio/util.py
@@ -138,6 +138,10 @@ def __init__(self, service, privilege, params=None):
         self.params = params
 
     def __str__(self):
-        params = urlencode(self.params) if self.params else None
-        param_string = "?%s" % params if params else ''
+        if self.params:
+            sorted_params = sorted([(k, v) for k, v in self.params.items()])
+            encoded_params = urlencode(sorted_params)
+            param_string = '?%s' % encoded_params
+        else:
+            param_string = ''
         return "scope:%s:%s%s" % (self.service, self.privilege, param_string)
