Skip to content

Make Adyen.httpclient module Python 3 compatible #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 13, 2017
Merged

Make Adyen.httpclient module Python 3 compatible #25

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71b1bb4
Make urlencode import Python 2/3 compatible
woochica Jul 13, 2017
caef8d3
Make urllib2 import Python 2/3 compatible
woochica Jul 13, 2017
21dde65
Make StringIO import Python 2/3 compatible
woochica Jul 13, 2017
06049aa
Add missing urlopen import
woochica Jul 13, 2017
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
25 changes: 19 additions & 6 deletions Adyen/httpclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,23 @@
except ImportError:
pycurl = None

import urllib2
try:
# Python 3
from urllib.parse import urlencode
from urllib.request import Request, urlopen
from urllib.error import HTTPError
except ImportError:
# Python 2
from urllib import urlencode
from urllib2 import Request, urlopen, HTTPError

try:
# Python 3
from io import StringIO
except ImportError:
# Python 2
from StringIO import StringIO

from urllib import urlencode
from StringIO import StringIO
import json as json_lib
import re
import base64
Expand Down Expand Up @@ -223,7 +236,7 @@ def _urllib_post(self, url,
raw_store = json

raw_request = json_lib.dumps(json) if json else urlencode(data)
url_request = urllib2.Request(url,data=raw_request)
url_request = Request(url,data=raw_request)
if json:
url_request.add_header('Content-Type','application/json')
elif not data:
Expand All @@ -248,8 +261,8 @@ def _urllib_post(self, url,

#URLlib raises all non 200 responses as en error.
try:
response = urllib2.urlopen(url_request, timeout=timeout)
except urllib2.HTTPError as e:
response = urlopen(url_request, timeout=timeout)
except HTTPError as e:
raw_response = e.read()

return raw_response, raw_request, e.getcode(), e.headers
Expand Down