Skip to content

Commit 9f8b0ad

Browse files
authored
PW-279: Refactor code to PEP8 standards (#41)
- Refactored code - Added pycodestyle to the Travis "script" to check for PEP8 compliance - Added pylint to the Travis "after_success" to get a score for general code cleaning
1 parent a13094f commit 9f8b0ad

File tree

14 files changed

+566
-390
lines changed

14 files changed

+566
-390
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ install:
99
- pip install pycurl
1010
- pip install mock
1111
- pip install coveralls
12+
- pip install pylint
13+
- pip install pycodestyle
1214
script:
1315
- coverage run -m unittest discover -s test -p '*Test.py'
16+
- pycodestyle -v
1417
after_success:
15-
coveralls
18+
- coveralls
19+
- pylint Adyen

Adyen/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/python
22

3-
from __future__ import absolute_import, division, print_function, unicode_literals
3+
from __future__ import absolute_import, division, unicode_literals
44

55
from . import util
66
from .util import generate_hpp_sig
@@ -21,14 +21,13 @@
2121

2222
from .httpclient import HTTPClient
2323

24-
import datetime
24+
username = None
25+
password = None
26+
platform = None
27+
merchant_account = None
28+
merchant_specific_url = None
29+
hmac = None
2530

26-
username = ""
27-
password = ""
28-
platform = ""
29-
merchant_account = ""
30-
merchant_specific_url = ""
31-
hmac = ""
3231

3332
class Adyen(AdyenBase):
3433
def __init__(self, **kwargs):
@@ -37,6 +36,7 @@ def __init__(self, **kwargs):
3736
self.hpp = AdyenHPP(client=self.client)
3837
self.recurring = AdyenRecurring(client=self.client)
3938

39+
4040
_base_adyen_obj = Adyen()
4141
recurring = _base_adyen_obj.recurring
4242
hpp = _base_adyen_obj.hpp

Adyen/client.py

Lines changed: 157 additions & 117 deletions
Large diffs are not rendered by default.

Adyen/exceptions.py

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,75 @@
1-
from __future__ import absolute_import, division, print_function, unicode_literals
1+
from __future__ import absolute_import, division, unicode_literals
22

3-
class AdyenError(Exception):
43

4+
class AdyenError(Exception):
55
def __init__(self,
6-
message,
7-
raw_request="",
8-
raw_response="",
9-
url="",
10-
psp="",
11-
headers="",
12-
status_code=""):
6+
message,
7+
raw_request="",
8+
raw_response="",
9+
url="",
10+
psp="",
11+
headers="",
12+
status_code=""):
1313
self.message = message
14-
self.raw_request=raw_request
15-
self.raw_response=raw_response
16-
self.url=url
17-
self.psp=psp
18-
self.headers=headers
19-
self.status_code=status_code
14+
self.raw_request = raw_request
15+
self.raw_response = raw_response
16+
self.url = url
17+
self.psp = psp
18+
self.headers = headers
19+
self.status_code = status_code
2020

2121
def __str__(self):
2222
return repr(self.message)
2323

2424
def debug(self):
25-
return "message: {}\nHTTP status_code:{}\nurl: {}\nrequest: {}\nresponse: {}\nheaders: {}".format(
26-
self.message,
27-
self.status_code,
28-
self.url,
29-
self.raw_request,
30-
self.raw_response,
31-
self.headers)
25+
return "message: {}\nHTTP status_code:{}\nurl: {}\nrequest:" \
26+
" {}\nresponse: {}\nheaders: {}".format(
27+
self.message,
28+
self.status_code,
29+
self.url,
30+
self.raw_request,
31+
self.raw_response,
32+
self.headers)
33+
3234

3335
class AdyenInvalidRequestError(AdyenError):
3436
pass
3537

36-
class AdyenAPIResponseError(AdyenError):
3738

39+
class AdyenAPIResponseError(AdyenError):
3840
def __init__(self,
39-
message,
40-
result="",
41-
error_code="",
42-
*args,
43-
**kwargs):
44-
super(AdyenAPIResponseError,self).__init__(message, *args,**kwargs)
45-
self.error_code=error_code
46-
self.result=result
41+
message,
42+
result="",
43+
error_code="",
44+
*args,
45+
**kwargs):
46+
super(AdyenAPIResponseError, self).__init__(message, *args, **kwargs)
47+
self.error_code = error_code
48+
self.result = result
4749

4850
def __str__(self):
4951
return repr(self.message)
5052

53+
5154
class AdyenAPIAuthenticationError(AdyenAPIResponseError):
5255
pass
5356

57+
5458
class AdyenAPIInvalidPermission(AdyenAPIResponseError):
5559
pass
5660

61+
5762
class AdyenAPICommunicationError(AdyenAPIResponseError):
5863
pass
5964

65+
6066
class AdyenAPIValidationError(AdyenAPIResponseError):
6167
pass
6268

69+
6370
class AdyenAPIInvalidAmount(AdyenAPIResponseError):
6471
pass
6572

73+
6674
class AdyenAPIInvalidFormat(AdyenAPIResponseError):
6775
pass

0 commit comments

Comments
 (0)