Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions postmonkey/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import requests
from urllib import quote
from urllib.request import quote
from functools import partial

from . exceptions import (
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions postmonkey/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':''}
Expand All @@ -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'}
Expand Down Expand Up @@ -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)
Expand Down