Skip to content

Commit b82c2f5

Browse files
committed
Fix pylint
1 parent 714b43d commit b82c2f5

File tree

4 files changed

+53
-31
lines changed

4 files changed

+53
-31
lines changed

.pylintrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[MESSAGES CONTROL]
2+
disable=missing-docstring,too-many-public-methods,too-few-public-methods,no-self-use,import-error,locally-disabled,invalid-name,wrong-import-order,,bad-option-value,ungrouped-imports,too-many-arguments,useless-object-inheritance,consider-using-f-string,unnecessary-lambda-assignment,raise-missing-from,unspecified-encoding
3+
4+
[FORMAT]
5+
max-line-length=120
6+
7+
[REPORTS]
8+
reports=no
9+
score=no
10+
output-format=parseable

mailboxer/mailboxer.py

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
from .query import Query
66

77

8-
class Mailboxer(object):
9-
8+
class Mailboxer:
109
def __init__(self, url):
11-
super(Mailboxer, self).__init__()
10+
super().__init__()
1211
self.url = URL(url).add_path("v2")
1312

1413
def create_mailbox(self, address):
@@ -18,7 +17,7 @@ def create_mailbox(self, address):
1817
def delete_mailbox(self, address):
1918
return self.get_mailbox(address).delete()
2019

21-
def get_emails(self, address, unread = False):
20+
def get_emails(self, address, unread=False):
2221
return self.get_mailbox(address).get_emails(unread)
2322

2423
def get_mailboxes(self, **kwargs):
@@ -31,48 +30,56 @@ def does_mailbox_exist(self, address):
3130
return Mailbox(self, address).exists()
3231

3332
def _post(self, url, data):
34-
returned = requests.post(url, data=json.dumps(data),
35-
headers={"Content-type": "application/json"})
33+
returned = requests.post(
34+
url,
35+
data=json.dumps(data),
36+
headers={"Content-type": "application/json"},
37+
timeout=30,
38+
)
3639
returned.raise_for_status()
3740
return returned
3841

3942
def _get_paged(self, url, obj):
40-
response = requests.get(url)
43+
response = requests.get(url, timeout=30)
4144
response.raise_for_status()
4245
return [obj(data) for data in response.json()["result"]]
4346

4447
def _mailbox_url(self, address):
4548
return self.url.add_path("mailboxes").add_path(address)
4649

47-
class Mailbox(object):
4850

51+
class Mailbox:
4952
def __init__(self, mailboxer, address):
50-
super(Mailbox, self).__init__()
53+
super().__init__()
5154
self.mailboxer = mailboxer
5255
self.address = address
5356
self.url = self.mailboxer.url.add_path("mailboxes").add_path(self.address)
5457

5558
@classmethod
56-
def from_query_json(cls, mailboxer, json):
59+
def from_query_json(cls, mailboxer, json): # pylint: disable=redefined-outer-name
5760
return cls(mailboxer, json["address"])
5861

59-
def get_emails(self, unread = False):
60-
url = self.url.add_path("unread_emails") if unread else self.url.add_path("emails")
61-
return self.mailboxer._get_paged(url, Email)
62+
def get_emails(self, unread=False):
63+
url = (
64+
self.url.add_path("unread_emails")
65+
if unread
66+
else self.url.add_path("emails")
67+
)
68+
return self.mailboxer._get_paged(url, Email) # pylint: disable=protected-access
6269

6370
def exists(self):
6471
url = self.url.add_path("emails")
65-
response = requests.get(url)
66-
if(response.status_code == requests.codes.not_found):
72+
response = requests.get(url, timeout=30)
73+
if response.status_code == requests.codes.not_found: # pylint: disable=no-member
6774
return False
6875
response.raise_for_status()
6976
return True
7077

7178
def delete(self):
72-
requests.delete(self.url).raise_for_status()
79+
requests.delete(self.url, timeout=30).raise_for_status()
7380

74-
class Email(object):
7581

82+
class Email:
7683
def __init__(self, email_dict):
77-
super(Email, self).__init__()
84+
super().__init__()
7885
self.__dict__.update(email_dict)

mailboxer/query.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import requests
22

3-
class Query(object):
43

4+
class Query:
55
_metadata = None
66

77
def __init__(self, client, url, objtype, page_size=100):
8-
super(Query, self).__init__()
8+
super().__init__()
99
self.client = client
1010
self.url = url.set_query_param("page_size", str(page_size))
1111
self.objtype = objtype
@@ -14,7 +14,9 @@ def __init__(self, client, url, objtype, page_size=100):
1414

1515
def _fetch_page(self, page_index):
1616
assert page_index > 0
17-
result = requests.get(self.url.set_query_param("page", str(page_index)))
17+
result = requests.get(
18+
self.url.set_query_param("page", str(page_index)), timeout=30
19+
)
1820
result.raise_for_status()
1921
result_json = result.json()
2022
if self._objects is None:
@@ -28,7 +30,7 @@ def __iter__(self):
2830

2931
def get_json_objects(self):
3032
for i in range(len(self)):
31-
obj = self._objects[i]
33+
assert self._objects is not None
3234
if self._objects[i] is None:
3335
self._fetch_page((i // self.page_size) + 1)
3436
assert self._objects[i] is not None
@@ -37,4 +39,5 @@ def get_json_objects(self):
3739
def __len__(self):
3840
if self._objects is None:
3941
self._fetch_page(1)
42+
assert self._objects is not None
4043
return len(self._objects)

tests/conftest.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from .flask_app import create_app, app_initializations
1010

1111

12-
@pytest.fixture(scope="session")
13-
def mailboxer_url(request):
12+
@pytest.fixture(scope="session", name="mailboxer_url")
13+
def mailboxer_url_fx():
1414
app = create_app()
1515
loopback = FlaskLoopback(app)
1616
hostname = str(uuid.uuid1())
@@ -22,24 +22,26 @@ def mailboxer_url(request):
2222
loopback.deactivate_address((hostname, port))
2323

2424

25-
@pytest.fixture
26-
def mailboxer(mailboxer_url):
25+
@pytest.fixture(name="mailboxer")
26+
def mailboxer_fx(mailboxer_url):
2727
return Mailboxer(mailboxer_url)
2828

29-
@pytest.fixture(
30-
params=[10]
31-
)
32-
def num_objects(request):
29+
30+
@pytest.fixture(params=[10], name="num_objects")
31+
def num_objects_fx(request):
3332
return request.param
3433

34+
3535
@pytest.fixture
3636
def mailbox(request, mailboxer):
3737
returned = mailboxer.create_mailbox("mailbox@mailboxer.com")
3838
request.addfinalizer(returned.delete)
3939
return returned
4040

41+
4142
@pytest.fixture
4243
def mailboxes(mailboxer, num_objects):
4344
return [
4445
mailboxer.create_mailbox("mailbox{0}@mailboxer.com".format(i))
45-
for i in range(num_objects)]
46+
for i in range(num_objects)
47+
]

0 commit comments

Comments
 (0)