Accomodate hash randomization.

Author: tseaver

oauth2/__init__.py

@@ -405,14 +405,14 @@ def to_header(self, realm=''):
 
     def to_postdata(self):
         """Serialize as post data for a POST request."""
-        d = {}
-        for k, v in self.items():
-            d[k.encode('utf-8')] = to_utf8_optional_iterator(v)
+        items = []
+        for k, v in sorted(self.items()): # predictable for testing
+            items.append((k.encode('utf-8'), to_utf8_optional_iterator(v)))
 
         # tell urlencode to deal with sequence values and map them correctly
         # to resulting querystring. for example self["k"] = ["v1", "v2"] will
         # result in 'k=v1&k=v2' and not k=%5B%27v1%27%2C+%27v2%27%5D
-        return urlencode(d, True).replace('+', '%20')
+        return urlencode(items, True).replace('+', '%20')
 
     def to_url(self):
         """Serialize as a URL for a GET request."""

tests/test_oauth.py

@@ -499,13 +499,14 @@ def test_to_postdata_nonascii(self):
         self.failUnlessReallyEqual(
             req.to_postdata(),
             ('nonasciithing=q%C2%BFu%C3%A9%20%2Caasp%20u%3F..a.s'
-             '&oauth_nonce=4572616e48616d6d65724c61686176'
-             '&oauth_timestamp=137131200'
              '&oauth_consumer_key=0685bd9184jfhq22'
+             '&oauth_nonce=4572616e48616d6d65724c61686176'
+             '&oauth_signature=wOJIO9A2W5mFwDgiDvZbTSMK%252FPY%253D'
              '&oauth_signature_method=HMAC-SHA1'
-             '&oauth_version=1.0'
+             '&oauth_timestamp=137131200'
              '&oauth_token=ad180jjd733klru7'
-             '&oauth_signature=wOJIO9A2W5mFwDgiDvZbTSMK%252FPY%253D'))
+             '&oauth_version=1.0'
+            ))
 
     def test_to_postdata(self):
         realm = "http://sp.example.com/"