diff --git a/postmonkey/__init__.py b/postmonkey/__init__.py index fa7581a..c5765ae 100644 --- a/postmonkey/__init__.py +++ b/postmonkey/__init__.py @@ -1,6 +1,6 @@ import json import requests -from urllib import quote +from urllib.request import quote from functools import partial from . exceptions import ( @@ -87,7 +87,7 @@ def _make_method_call(self, methodname, **kwargs): try: resp = self.postrequest(url, data=payload, headers=headers) - except Exception, e: + except Exception as e: raise PostRequestError(e) decoded = self._deserialize_response(resp.text) diff --git a/postmonkey/tests.py b/postmonkey/tests.py index 090cc19..fee5c55 100644 --- a/postmonkey/tests.py +++ b/postmonkey/tests.py @@ -25,7 +25,7 @@ def test_endpoint_explicit_datacenter(self): def test_serialize_valid_payload(self): import json - from urllib import unquote + from urllib.request import unquote settings = {'default1':'', 'default2':''} inst = self._makeOne(settings) payload = {'param1':'', 'param2':''} @@ -43,7 +43,7 @@ def test_serialize_invalid_payload(self): def test_payload_takes_precedence(self): import json - from urllib import unquote + from urllib.request import unquote settings = {'default1':'', 'default2':''} inst = self._makeOne(settings) payload = {'default1':'overriden'} @@ -155,7 +155,7 @@ def __init__(self, text): def dummy_post_request(url, data='', headers={}, timeout=None): import json - from urllib import unquote + from urllib.request import unquote params = json.loads(unquote(data)) resp = {'received': params} json = json.dumps(resp)