Accomodate hash randomization moar.

Author: tseaver

oauth2/__init__.py

@@ -269,15 +269,15 @@ def to_string(self):
         The resulting string includes the token's secret, so you should never
         send or store this string where a third party can read it.
         """
-
-        data = {
-            'oauth_token': self.key,
-            'oauth_token_secret': self.secret,
-        }
+        items = [
+            ('oauth_token', self.key),
+            ('oauth_token_secret', self.secret),
+        ]
 
         if self.callback_confirmed is not None:
-            data['oauth_callback_confirmed'] = self.callback_confirmed
-        return urlencode(data)
+            items.append(
+                ('oauth_callback_confirmed', self.callback_confirmed))
+        return urlencode(items)
 
     @staticmethod
     def from_string(s):

tests/test_oauth.py

@@ -215,8 +215,8 @@ def test_get_callback_url(self):
         self.assertEqual(url, '%s%s' % (cb, verifier_str))
 
     def test_to_string(self):
-        string = 'oauth_token_secret=%s&oauth_token=%s' % (self.secret,
-                                                           self.key)
+        string = 'oauth_token=%s&oauth_token_secret=%s' % (
+                        self.key, self.secret)
         self.assertEqual(self.token.to_string(), string)
 
         self.token.set_callback('http://www.example.com/my-callback')
@@ -236,7 +236,7 @@ def _compare_tokens(self, new):
     def test___str__(self):
         tok = oauth.Token('tooken', 'seecret')
         self.assertEqual(str(tok),
-                         'oauth_token_secret=seecret&oauth_token=tooken')
+                         'oauth_token=tooken&oauth_token_secret=seecret')
 
     def test_from_string(self):
         self.assertRaises(ValueError, lambda: oauth.Token.from_string(''))