{"repo": "discogs/discogs_client", "pull_number": 43, "instance_id": "discogs__discogs_client-43", "issue_numbers": "", "base_commit": "7a97275636e3524625d2743c93ac3c8826570bf3", "patch": "diff --git a/discogs_client/__init__.py b/discogs_client/__init__.py\n--- a/discogs_client/__init__.py\n+++ b/discogs_client/__init__.py\n@@ -1,4 +1,6 @@\n-__version_info__ = (2,0,2)\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n+__version_info__ = 2, 0, 2\n __version__ = '2.0.2'\n \n from discogs_client.client import Client\ndiff --git a/discogs_client/client.py b/discogs_client/client.py\n--- a/discogs_client/client.py\n+++ b/discogs_client/client.py\n@@ -1,13 +1,20 @@\n-import requests\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n+import warnings\n import json\n-import oauth2\n-import urllib\n+try:\n+    # python2\n+    from urllib import urlencode\n+except ImportError:\n+    # python3\n+    from urllib.parse import urlencode\n \n from discogs_client import models\n from discogs_client.exceptions import ConfigurationError, HTTPError\n from discogs_client.utils import update_qs\n from discogs_client.fetchers import RequestsFetcher, OAuth2Fetcher\n \n+\n class Client(object):\n     _base_url = 'https://api.discogs.com'\n     _request_token_url = 'https://api.discogs.com/oauth/request_token'\n@@ -44,9 +51,10 @@ def get_authorize_url(self, callback_url=None):\n \n         params = {}\n         params['User-Agent'] = self.user_agent\n+        params['Content-Type'] = 'application/x-www-form-urlencoded'\n         if callback_url:\n             params['oauth_callback'] = callback_url\n-        postdata = urllib.urlencode(params)\n+        postdata = urlencode(params)\n \n         content, status_code = self._fetcher.fetch(self, 'POST', self._request_token_url, data=postdata, headers=params)\n         if status_code != 200:\n@@ -55,7 +63,7 @@ def get_authorize_url(self, callback_url=None):\n         token, secret = self._fetcher.store_token_from_qs(content)\n \n         params = {'oauth_token': token}\n-        query_string = urllib.urlencode(params)\n+        query_string = urlencode(params)\n \n         return (token, secret, '?'.join((self._authorize_url, query_string)))\n \n@@ -63,6 +71,9 @@ def get_access_token(self, verifier):\n         \"\"\"\n         Uses the verifier to exchange a request token for an access token.\n         \"\"\"\n+        if isinstance(verifier, bytes):\n+            verifier = verifier.decode('utf8')\n+\n         self._fetcher.set_verifier(verifier)\n \n         params = {}\n@@ -82,7 +93,7 @@ def _check_user_agent(self):\n \n     def _request(self, method, url, data=None):\n         if self.verbose:\n-            print ' '.join((method, url))\n+            print(' '.join((method, url)))\n \n         self._check_user_agent()\n \n@@ -92,14 +103,14 @@ def _request(self, method, url, data=None):\n         }\n \n         if data:\n-            headers['Content-Type'] = 'application/json'\n+            headers['Content-Type'] = 'application/x-www-form-urlencoded'\n \n         content, status_code = self._fetcher.fetch(self, method, url, data=data, headers=headers)\n \n         if status_code == 204:\n             return None\n \n-        body = json.loads(content)\n+        body = json.loads(content.decode('utf8'))\n \n         if 200 <= status_code < 300:\n             return body\ndiff --git a/discogs_client/exceptions.py b/discogs_client/exceptions.py\n--- a/discogs_client/exceptions.py\n+++ b/discogs_client/exceptions.py\n@@ -1,3 +1,6 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n+\n class DiscogsAPIError(Exception):\n     \"\"\"Root Exception class for Discogs API errors.\"\"\"\n     pass\ndiff --git a/discogs_client/fetchers.py b/discogs_client/fetchers.py\n--- a/discogs_client/fetchers.py\n+++ b/discogs_client/fetchers.py\n@@ -1,8 +1,17 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n import requests\n-import oauth2\n+from requests.api import request\n+from oauthlib import oauth1\n import json\n-import urlparse\n import os\n+try:\n+    # python2\n+    from urlparse import parse_qsl\n+except ImportError:\n+    # python3\n+    from urllib.parse import parse_qsl\n+\n \n class Fetcher(object):\n     \"\"\"\n@@ -12,8 +21,14 @@ class Fetcher(object):\n     (It's a slightly leaky abstraction designed to make testing easier.)\n     \"\"\"\n     def fetch(self, client, method, url, data=None, headers=None, json=True):\n-        # Should return (content, status_code)\n-        raise NotImplemented\n+        \"\"\"Fetch the given request\n+\n+        Returns\n+        -------\n+        content : str (python2) or bytes (python3)\n+        status_code : int\n+        \"\"\"\n+        raise NotImplementedError()\n \n \n class LoggingDelegator(object):\n@@ -41,42 +56,38 @@ def fetch(self, client, method, url, data=None, headers=None, json=True):\n class OAuth2Fetcher(Fetcher):\n     \"\"\"Fetches via HTTP + OAuth 1.0a from the Discogs API.\"\"\"\n     def __init__(self, consumer_key, consumer_secret, token=None, secret=None):\n-        consumer = oauth2.Consumer(consumer_key, consumer_secret)\n-        token_obj = None\n-\n-        if token and secret:\n-            token_obj = oauth2.Token(token, secret)\n-\n-        self.oauth_client = oauth2.Client(consumer, token_obj)\n+        self.client = oauth1.Client(consumer_key, client_secret=consumer_secret)\n+        self.store_token(token, secret)\n \n     def store_token_from_qs(self, query_string):\n-        token_dict = dict(urlparse.parse_qsl(query_string))\n-        token = token_dict['oauth_token']\n-        secret = token_dict['oauth_token_secret']\n+        token_dict = dict(parse_qsl(query_string))\n+        token = token_dict[b'oauth_token'].decode('utf8')\n+        secret = token_dict[b'oauth_token_secret'].decode('utf8')\n         self.store_token(token, secret)\n         return token, secret\n \n     def forget_token(self):\n-        self.oauth_client.token = None\n+        self.store_token(None, None)\n \n     def store_token(self, token, secret):\n-        self.oauth_client.token = oauth2.Token(token, secret)\n+        self.client.resource_owner_key = token\n+        self.client.resource_owner_secret = secret\n \n     def set_verifier(self, verifier):\n-        self.oauth_client.token.set_verifier(verifier)\n+        self.client.verifier = verifier\n \n     def fetch(self, client, method, url, data=None, headers=None, json_format=True):\n-        if data:\n-            body = json.dumps(data) if json_format else data\n-            resp, content = self.oauth_client.request(url, method, body, headers=headers)\n-        else:\n-            resp, content = self.oauth_client.request(url, method, headers=headers)\n-        return content, int(resp['status'])\n+        body = json.dumps(data) if json_format and data else data\n+        uri, headers, body = self.client.sign(url, http_method=method,\n+                                              body=data, headers=headers)\n+\n+        resp = request(method, uri, headers=headers, data=body)\n+        return resp.content, resp.status_code\n \n \n class FilesystemFetcher(Fetcher):\n     \"\"\"Fetches from a directory of files.\"\"\"\n-    default_response = json.dumps({'message': 'Resource not found.'}), 404\n+    default_response = json.dumps({'message': 'Resource not found.'}).encode('utf8'), 404\n \n     def __init__(self, base_path):\n         self.base_path = base_path\n@@ -92,7 +103,7 @@ def fetch(self, client, method, url, data=None, headers=None, json=True):\n         path = os.path.join(self.base_path, base_name)\n         try:\n             with open(path, 'r') as f:\n-                content = f.read()\n+                content = f.read().encode('utf8')  # return bytes not unicode\n             return content, 200\n         except:\n             return self.default_response\n@@ -100,7 +111,7 @@ def fetch(self, client, method, url, data=None, headers=None, json=True):\n \n class MemoryFetcher(Fetcher):\n     \"\"\"Fetches from a dict of URL -> (content, status_code).\"\"\"\n-    default_response = json.dumps({'message': 'Resource not found.'}), 404\n+    default_response = json.dumps({'message': 'Resource not found.'}).encode('utf8'), 404\n \n     def __init__(self, responses):\n         self.responses = responses\ndiff --git a/discogs_client/models.py b/discogs_client/models.py\n--- a/discogs_client/models.py\n+++ b/discogs_client/models.py\n@@ -1,3 +1,7 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n+from six import with_metaclass\n+\n from discogs_client.exceptions import HTTPError\n from discogs_client.utils import parse_timestamp, update_qs, omit_none\n \n@@ -171,14 +175,14 @@ class ObjectCollection(Field):\n \n class APIObjectMeta(type):\n     def __new__(cls, name, bases, dict_):\n-        for k, v in dict_.iteritems():\n+        for k, v in dict_.items():\n             if isinstance(v, Field):\n                 dict_[k] = v.to_descriptor(k)\n         return super(APIObjectMeta, cls).__new__(cls, name, bases, dict_)\n \n \n-class APIObject(object):\n-    __metaclass__ = APIObjectMeta\n+class APIObject(with_metaclass(APIObjectMeta, object)):\n+    pass\n \n \n class PrimaryAPIObject(APIObject):\n@@ -307,7 +311,7 @@ def _url_for_page(self, page):\n         return update_qs(self.url, base_qs)\n \n     def sort(self, key, order='asc'):\n-        if not order in ('asc', 'desc'):\n+        if order not in ('asc', 'desc'):\n             raise ValueError(\"Order must be one of 'asc', 'desc'\")\n         self._sort_key = key\n         self._sort_order = order\n@@ -332,7 +336,7 @@ def count(self):\n         return self._num_items\n \n     def page(self, index):\n-        if not index in self._pages:\n+        if index not in self._pages:\n             data = self.client._get(self._url_for_page(index))\n             self._pages[index] = [\n                 self._transform(item) for item in data[self._list_key]\n@@ -343,12 +347,12 @@ def _transform(self, item):\n         return item\n \n     def __getitem__(self, index):\n-        page_index = index / self.per_page + 1\n+        page_index = index // self.per_page + 1\n         offset = index % self.per_page\n \n         try:\n             page = self.page(page_index)\n-        except HTTPError, e:\n+        except HTTPError as e:\n             if e.status_code == 404:\n                 raise IndexError(e.msg)\n             else:\n@@ -360,7 +364,7 @@ def __len__(self):\n         return self.count\n \n     def __iter__(self):\n-        for i in xrange(1, self.pages + 1):\n+        for i in range(1, self.pages + 1):\n             page = self.page(i)\n             for item in page:\n                 yield item\n@@ -381,7 +385,7 @@ class Wantlist(PaginatedList):\n     def add(self, release, notes=None, notes_public=None, rating=None):\n         release_id = release.id if isinstance(release, Release) else release\n         data = {\n-            'release_id': release_id,\n+            'release_id': str(release_id),\n             'notes': notes,\n             'notes_public': notes_public,\n             'rating': rating,\ndiff --git a/discogs_client/utils.py b/discogs_client/utils.py\n--- a/discogs_client/utils.py\n+++ b/discogs_client/utils.py\n@@ -1,5 +1,15 @@\n+from __future__ import unicode_literals\n+\n from datetime import datetime\n-from urllib2 import quote\n+try:\n+    # python2\n+    from urllib2 import quote\n+    to_str = unicode\n+except ImportError:\n+    # python3\n+    from urllib.parse import quote\n+    to_str = str\n+\n \n def parse_timestamp(timestamp):\n     \"\"\"Convert an ISO 8601 timestamp into a datetime.\"\"\"\n@@ -8,11 +18,12 @@ def parse_timestamp(timestamp):\n \n def update_qs(url, params):\n     \"\"\"A not-very-intelligent function to glom parameters onto a query string.\"\"\"\n-    joined_qs = '&'.join('='.join((str(k), quote(str(v)))) for k, v in params.iteritems())\n+    joined_qs = '&'.join('='.join((str(k), quote(to_str(v).encode('utf8'))))\n+                         for k, v in params.items())\n     separator = '&' if '?' in url else '?'\n     return url + separator + joined_qs\n \n \n def omit_none(dict_):\n     \"\"\"Removes any key from a dict that has a value of None.\"\"\"\n-    return dict((k, v) for k, v in dict_.iteritems() if v is not None)\n+    return dict((k, v) for k, v in dict_.items() if v is not None)\ndiff --git a/setup.py b/setup.py\nold mode 100644\nnew mode 100755\n--- a/setup.py\n+++ b/setup.py\n@@ -21,10 +21,10 @@\n             ],\n         install_requires=[\n             'requests',\n-            'oauth2',\n+            'six',\n+            'oauthlib',\n             ],\n         packages=[\n             'discogs_client',\n             ],\n         )\n-\n", "test_patch": "diff --git a/discogs_client/tests/__init__.py b/discogs_client/tests/__init__.py\n--- a/discogs_client/tests/__init__.py\n+++ b/discogs_client/tests/__init__.py\n@@ -5,6 +5,7 @@\n from discogs_client.fetchers import LoggingDelegator, FilesystemFetcher, \\\n     MemoryFetcher\n \n+\n class DiscogsClientTestCase(unittest.TestCase):\n     def setUp(self):\n \n@@ -18,9 +19,9 @@ def setUp(self):\n \n         # Memory client\n         responses = {\n-            '/artists/1': ('{\"id\": 1, \"name\": \"Badger\"}', 200),\n-            '/500': ('{\"message\": \"mushroom\"}', 500),\n-            '/204': ('', 204),\n+            '/artists/1': (b'{\"id\": 1, \"name\": \"Badger\"}', 200),\n+            '/500': (b'{\"message\": \"mushroom\"}', 500),\n+            '/204': (b'', 204),\n         }\n         self.m = Client('ua')\n         self.m._base_url = ''\n@@ -40,6 +41,7 @@ def assertPosted(self, assert_url, assert_data):\n         self.assertEqual(url, assert_url)\n         self.assertEqual(data, json.dumps(assert_data))\n \n+\n def suite():\n     from discogs_client.tests import test_core, test_models, test_fetchers\n     suite = unittest.TestSuite(test_core.suite())\ndiff --git a/discogs_client/tests/make_symlinks.py b/discogs_client/tests/make_symlinks.py\nnew file mode 100755\n--- /dev/null\n+++ b/discogs_client/tests/make_symlinks.py\n@@ -0,0 +1,16 @@\n+#!/usr/bin/env python\n+import os\n+import sys\n+from itertools import permutations\n+\n+for name in sys.argv[1:]:\n+    print(\"doing {}\".format(name))\n+    root, next = name.split('?')\n+    data, ext = next.split('.')\n+    elems = data.split('&')\n+    for permut in permutations(elems):\n+        link_name = \"{}?{}.{}\".format(root, '&'.join(permut), ext)\n+        if link_name == name:\n+            continue\n+        os.symlink(name, link_name)\n+        print(\"wrote {}\".format(link_name))\ndiff --git a/discogs_client/tests/res/artists/1/releases?page=1&per_page=50.json b/discogs_client/tests/res/artists/1/releases?page=1&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/artists/1/releases?page=1&per_page=50.json\n@@ -0,0 +1 @@\n+releases?per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/artists/1/releases?page=2&per_page=50.json b/discogs_client/tests/res/artists/1/releases?page=2&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/artists/1/releases?page=2&per_page=50.json\n@@ -0,0 +1 @@\n+releases?per_page=50&page=2.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/database/search?page=1&per_page=50&q=trash80.json b/discogs_client/tests/res/database/search?page=1&per_page=50&q=trash80.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/database/search?page=1&per_page=50&q=trash80.json\n@@ -0,0 +1 @@\n+search?q=trash80&per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/database/search?page=1&q=trash80&per_page=50.json b/discogs_client/tests/res/database/search?page=1&q=trash80&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/database/search?page=1&q=trash80&per_page=50.json\n@@ -0,0 +1 @@\n+search?q=trash80&per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/database/search?per_page=50&page=1&q=trash80.json b/discogs_client/tests/res/database/search?per_page=50&page=1&q=trash80.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/database/search?per_page=50&page=1&q=trash80.json\n@@ -0,0 +1 @@\n+search?q=trash80&per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/database/search?per_page=50&q=trash80&page=1.json b/discogs_client/tests/res/database/search?per_page=50&q=trash80&page=1.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/database/search?per_page=50&q=trash80&page=1.json\n@@ -0,0 +1 @@\n+search?q=trash80&per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/database/search?q=trash80&page=1&per_page=50.json b/discogs_client/tests/res/database/search?q=trash80&page=1&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/database/search?q=trash80&page=1&per_page=50.json\n@@ -0,0 +1 @@\n+search?q=trash80&per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/masters/4242/versions?page=1&per_page=50.json b/discogs_client/tests/res/masters/4242/versions?page=1&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/masters/4242/versions?page=1&per_page=50.json\n@@ -0,0 +1 @@\n+versions?per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/res/users/example/wants?page=1&per_page=50.json b/discogs_client/tests/res/users/example/wants?page=1&per_page=50.json\nnew file mode 120000\n--- /dev/null\n+++ b/discogs_client/tests/res/users/example/wants?page=1&per_page=50.json\n@@ -0,0 +1 @@\n+wants?per_page=50&page=1.json\n\\ No newline at end of file\ndiff --git a/discogs_client/tests/test_core.py b/discogs_client/tests/test_core.py\n--- a/discogs_client/tests/test_core.py\n+++ b/discogs_client/tests/test_core.py\n@@ -1,9 +1,12 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n import unittest\n from discogs_client import Client\n from discogs_client.tests import DiscogsClientTestCase\n from discogs_client.exceptions import ConfigurationError, HTTPError\n from datetime import datetime\n \n+\n class CoreTestCase(DiscogsClientTestCase):\n     def test_user_agent(self):\n         \"\"\"User-Agent should be properly set\"\"\"\n@@ -28,7 +31,7 @@ def test_caching(self):\n         self.assertEqual(a.name, 'Persuader, The')\n         self.assertGot('/artists/1')\n \n-        self.assertEqual(a.real_name, u'Jesper Dahlb\\u00e4ck')\n+        self.assertEqual(a.real_name, 'Jesper Dahlb\\u00e4ck')\n         self.assertEqual(len(self.d._fetcher.requests), 1)\n \n         # Get a key that's not in our cache\n@@ -44,7 +47,7 @@ def test_equality(self):\n         \"\"\"APIObjects of the same class are equal if their IDs are\"\"\"\n         a1 = self.d.artist(1)\n         a1_ = self.d.artist(1)\n-        a2 = self.d.artist(2)\n+        self.d.artist(2)\n \n         r1 = self.d.release(1)\n \n@@ -65,6 +68,7 @@ def test_object_field(self):\n     def test_read_only_simple_field(self):\n         \"\"\"Can't write to a SimpleField when writable=False\"\"\"\n         u = self.d.user('example')\n+\n         def fail():\n             u.rank = 9001\n         self.assertRaises(AttributeError, fail)\n@@ -72,6 +76,7 @@ def fail():\n     def test_read_only_object_field(self):\n         \"\"\"Can't write to an ObjectField\"\"\"\n         m = self.d.master(4242)\n+\n         def fail():\n             m.main_release = 'lol!'\n         self.assertRaises(AttributeError, fail)\n@@ -103,7 +108,11 @@ def test_pagination(self):\n         results.per_page = 10\n         self.assertTrue(results._num_pages is None)\n \n+\n def suite():\n     suite = unittest.TestSuite()\n     suite = unittest.TestLoader().loadTestsFromTestCase(CoreTestCase)\n     return suite\n+\n+if __name__ == '__main__':\n+    unittest.main(defaultTest='suite')\ndiff --git a/discogs_client/tests/test_fetchers.py b/discogs_client/tests/test_fetchers.py\n--- a/discogs_client/tests/test_fetchers.py\n+++ b/discogs_client/tests/test_fetchers.py\n@@ -1,7 +1,10 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n import unittest\n from discogs_client.tests import DiscogsClientTestCase\n from discogs_client.exceptions import HTTPError\n \n+\n class FetcherTestCase(DiscogsClientTestCase):\n     def test_memory_fetcher(self):\n         \"\"\"Client can fetch responses with MemoryFetcher\"\"\"\n@@ -23,3 +26,5 @@ def suite():\n     suite = unittest.TestLoader().loadTestsFromTestCase(FetcherTestCase)\n     return suite\n \n+if __name__ == '__main__':\n+    unittest.main(defaultTest='suite')\ndiff --git a/discogs_client/tests/test_models.py b/discogs_client/tests/test_models.py\n--- a/discogs_client/tests/test_models.py\n+++ b/discogs_client/tests/test_models.py\n@@ -1,7 +1,10 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n import unittest\n from discogs_client.models import Artist, Release\n from discogs_client.tests import DiscogsClientTestCase\n-from discogs_client.exceptions import ConfigurationError, HTTPError\n+from discogs_client.exceptions import HTTPError\n+\n \n class ModelsTestCase(DiscogsClientTestCase):\n     def test_artist(self):\n@@ -79,7 +82,7 @@ def test_master_versions(self):\n     def test_user_writable(self):\n         \"\"\"User profile can be updated\"\"\"\n         u = self.d.user('example')\n-        u.name # Trigger a fetch\n+        u.name  # Trigger a fetch\n \n         method, url, data, headers = self.d._fetcher.requests[0]\n         self.assertEqual(method, 'GET')\n@@ -111,8 +114,8 @@ def test_wantlist(self):\n \n         # Stub out expected responses\n         self.m._fetcher.fetcher.responses = {\n-            '/users/example/wants/5': ('{\"id\": 5}', 201),\n-            '/users/example/wants/1': ('', 204),\n+            '/users/example/wants/5': (b'{\"id\": 5}', 201),\n+            '/users/example/wants/1': (b'', 204),\n         }\n \n         # Now bind the user to the memory client\n@@ -148,3 +151,6 @@ def suite():\n     suite = unittest.TestSuite()\n     suite = unittest.TestLoader().loadTestsFromTestCase(ModelsTestCase)\n     return suite\n+\n+if __name__ == '__main__':\n+    unittest.main(defaultTest='suite')\ndiff --git a/discogs_client/tests/test_utils.py b/discogs_client/tests/test_utils.py\n--- a/discogs_client/tests/test_utils.py\n+++ b/discogs_client/tests/test_utils.py\n@@ -1,15 +1,26 @@\n+from __future__ import absolute_import, division, print_function, unicode_literals\n+\n import unittest\n from datetime import datetime\n from discogs_client.tests import DiscogsClientTestCase\n from discogs_client import utils\n \n+\n class UtilsTestCase(DiscogsClientTestCase):\n     def test_update_qs(self):\n         \"\"\"update_qs helper works as intended\"\"\"\n         u = utils.update_qs\n         self.assertEqual(u('http://example.com', {'foo': 'bar'}), 'http://example.com?foo=bar')\n         self.assertEqual(u('http://example.com?foo=bar', {'foo': 'baz'}), 'http://example.com?foo=bar&foo=baz')\n-        self.assertEqual(u('http://example.com?c=3&a=yep', {'a': 1, 'b': '1'}), 'http://example.com?c=3&a=yep&a=1&b=1')\n+        # be careful for dict iteration order is not deterministic\n+        result = u('http://example.com?c=3&a=yep', {'a': 1, 'b': '1'})\n+        try:\n+            self.assertEqual(result, 'http://example.com?c=3&a=yep&a=1&b=1')\n+        except AssertionError:\n+            self.assertEqual(result, 'http://example.com?c=3&a=yep&b=1&a=1')\n+\n+        self.assertEqual(u('http://example.com', {'a': 't\\xe9st'}),\n+                         'http://example.com?a=t%C3%A9st')\n \n     def test_omit_none(self):\n         o = utils.omit_none\n@@ -32,7 +43,11 @@ def test_parse_timestamp(self):\n         self.assertEqual(p('2012-01-01T00:00:00'), datetime(2012, 1, 1, 0, 0, 0))\n         self.assertEqual(p('2001-05-25T00:00:42'), datetime(2001, 5, 25, 0, 0, 42))\n \n+\n def suite():\n     suite = unittest.TestSuite()\n     suite = unittest.TestLoader().loadTestsFromTestCase(UtilsTestCase)\n     return suite\n+\n+if __name__ == '__main__':\n+    unittest.main(defaultTest='suite')\n", "problem_statement": "", "hints_text": "", "created_at": "2015-01-16T17:09:41Z"}