8000 Merge pull request #112 from twilio/flake8 · Stackdriver/twilio-python@bb9f4a3 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Feb 1, 2018. It is now read-only.

Commit bb9f4a3

Browse files
kyleconroykyleconroy
committed
Merge pull request twilio#112 from twilio/flake8
Add automatic PEP8 compliance via Flake8
2 parents d86762a + a3f0bae commit bb9f4a3

27 files changed

+105
-111
lines changed

‎.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ python:
77
install:
88
- pip install . --use-mirrors
99
- pip install -r requirements.txt --use-mirrors
10-
script: nosetests
10+
- pip install -r tests/requirements.txt --use-mirrors
11+
script:
12+
- flake8 --ignore=F401 twilio
13+
- flake8 --ignore=E123,E126,E128,E501 tests
14+
- nosetests

‎tests/requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
sphinx
22
mock==0.8.0
33
nose
4-
simplejson
5-
unittest2
64
coverage
75
nosexcover
8-
six
6+
flake8

‎tests/test_authorized_connect_apps.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_get(self, mock):
2525

2626
self.resource.get("SID")
2727
mock.assert_called_with("GET", "/base/AuthorizedConnectApps/SID",
28-
auth=self.auth)
28+
auth=self.auth)
2929

3030
@patch("twilio.rest.resources.base.make_twilio_request")
3131
def test_list(self, mock):
@@ -34,7 +34,7 @@ def test_list(self, mock):
3434

3535
self.resource.list()
3636
mock.assert_called_with("GET", "/base/AuthorizedConnectApps",
37-
params={}, auth=self.auth)
37+
params={}, auth=self.auth)
3838

3939
def test_load(self):
4040
instance = AuthorizedConnectApp(Mock(), "sid")
@@ -47,7 +47,7 @@ def test_load(self):
4747
"connect_app_company_name": "bar",
4848
"connect_app_homepage_url": "http://www.google.com",
4949
"uri": "/2010-04-01/Accounts/",
50-
})
50+
})
5151

5252
self.assertEquals(instance.permissions, ["get-all"])
5353
self.assertEquals(instance.sid, "SID")

‎tests/test_base_resource.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
else:
77
import unittest2 as unittest
88

9-
from mock import Mock, patch
9+
from mock import Mock
1010
from nose.tools import assert_equals
11-
from nose.tools import raises
1211
from twilio.rest.resources import Resource
1312
from twilio.rest.resources import ListResource
1413
from twilio.rest.resources import InstanceResource
@@ -27,6 +26,7 @@ def test_resource_init():
2726
assert_equals(r.auth, auth)
2827
assert_equals(r.uri, uri)
2928

29+
3030
def test_equivalence():
3131
p = ListResource(base_uri, auth)
3232
r1 = p.load_instance({"sid": "AC123"})
@@ -43,7 +43,7 @@ def testListResourceInit(self):
4343
uri = "%s/%s" % (base_uri, self.r.name)
4444
self.assertEquals(self.r.uri, uri)
4545

46-
def testKeyValue(self):
46+
def testKeyValueLower(self):
4747
self.assertEquals(self.r.key, self.r.name.lower())
4848

4949
def testIterNoKey(self):
@@ -58,7 +58,7 @@ def testRequest(self):
5858
self.r.request.return_value = Mock(), {self.r.key: [{'sid': 'foo'}]}
5959
advance_iterator(self.r.iter())
6060
self.r.request.assert_called_with("GET", "https://api.twilio.com/2010-04-01/Resources", params={})
61-
61+
6262
def testIterOneItem(self):
6363
self.r.request = Mock()
6464
self.r.request.return_value = Mock(), {self.r.key: [{'sid': 'foo'}]}
@@ -68,24 +68,17 @@ def testIterOneItem(self):
6868

6969
with self.assertRaises(StopIteration):
7070
advance_iterator(items)
71-
71+
7272
def testIterNoNextPage(self):
7373
self.r.request = Mock()
7474
self.r.request.return_value = Mock(), {self.r.key: []}
7575

7676
with self.assertRaises(StopIteration):
7777
advance_iterator(self.r.iter())
78-
78+
7979
def testKeyValue(self):
8080
self.r.key = "Hey"
8181
self.assertEquals(self.r.key, "Hey")
82-
83-
def testInstanceLoading(self):
84-
instance = self.r.load_instance({"sid": "foo"})
85-
86-
self.assertIsInstance(instance, InstanceResource)
87-
self.assertEquals(instance.sid, "foo")
88-
8982

9083
def testInstanceLoading(self):
9184
instance = self.r.load_instance({"sid": "foo"})
@@ -122,4 +115,3 @@ def testLoadSubresources(self):
122115
self.r.subresources = [m]
123116
self.r.load_subresources()
124117
m.assert_called_with(self.r.uri, self.r.auth)
125-

‎tests/test_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from mock import patch, Mock
99
from tools import create_mock_json
1010

11-
1211
AUTH = ("ACCOUNT_SID", "AUTH_TOKEN")
1312

13+
1414
class RestClientTest(unittest.TestCase):
1515

1616
def setUp(self):

‎tests/test_conferences.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import unittest2 as unittest
66

77
from datetime import date
8-
from mock import patch, Mock
8+
from mock import Mock
99
from twilio.rest.resources import Conferences
1010

1111
DEFAULT = {
@@ -46,6 +46,3 @@ def test_list_before(self):
4646
self.resource.list(created_before=date(2011, 1, 1))
4747
self.params["DateCreated<"] = "2011-01-01"
4848
self.resource.get_instances.assert_called_with(self.params)
49-
50-
51-

‎tests/test_core.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
class CoreTest(unittest.TestCase):
1717

1818
def test_date(self):
19-
d = date(2009,10,10)
19+
d = date(2009, 10, 10)
2020
self.assertEquals(parse_date(d), "2009-10-10")
2121

2222
def test_datetime(self):
23-
d = datetime(2009,10,10)
23+
d = datetime(2009, 10, 10)
2424
self.assertEquals(parse_date(d), "2009-10-10")
2525

2626
def test_string_date(self):
2727
d = "2009-10-10"
2828
self.assertEquals(parse_date(d), "2009-10-10")
2929

30-
def test_string_date(self):
30+
def test_string_date_none(self):
3131
d = None
3232
self.assertEquals(parse_date(d), None)
3333

34-
def test_string_date(self):
34+
def test_string_date_false(self):
3535
d = False
3636
self.assertEquals(parse_date(d), None)
3737

3838
def test_fparam(self):
3939
d = {"HEY": None, "YOU": 3}
40-
ed = {"YOU":3}
40+
ed = {"YOU": 3}
4141
self.assertEquals(transform_params(d), ed)
4242

4343
def test_fparam_booleans(self):
4444
d = {"HEY": None, "YOU": 3, "Activated": False}
45-
ed = {"YOU":3, "Activated": "false"}
45+
ed = {"YOU": 3, "Activated": "false"}
4646
self.assertEquals(transform_params(d), ed)
4747

4848
def test_normalize_dates(self):
@@ -55,8 +55,8 @@ def foo(on=None, before=None, after=None):
5555
"after": after,
5656
}
5757

58-
d = foo(on="2009-10-10", before=date(2009,10,10),
59-
after=datetime(2009,10,10))
58+
d = foo(on="2009-10-10", before=date(2009, 10, 10),
59+
after=datetime(2009, 10, 10))
6060

6161
self.assertEquals(d["on"], "2009-10-10")
6262
self.assertEquals(d["after"], "2009-10-10")
@@ -88,4 +88,3 @@ def test_convert_keys(self):
8888
}
8989

9090
self.assertEquals(ed, convert_keys(d))
91-

‎tests/test_jwt.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
from twilio.util import TwilioCapability
1010

11+
1112
class JwtTest(unittest.TestCase):
1213

1314
def assertIn(self, foo, bar, msg=None):
@@ -64,7 +65,6 @@ def test_events_with_filters(self):
6465
event_uri = "scope:stream:subscribe?path=%2F2010-04-01%2FEvents&params=foobar%3Dhey"
6566
self.assertEquals(payload["scope"], event_uri)
6667

67-
6868
def test_decode(self):
6969
token = TwilioCapability("AC123", "XXXXX")
7070
token.allow_client_outgoing("AP123", foobar=3)
@@ -106,18 +106,14 @@ def test_decodes_valid_jwt(self):
106106

107107
def test_allow_skip_verification(self):
108108
right_secret = 'foo'
109-
bad_secret = 'bar'
110109
jwt_message = jwt.encode(self.payload, right_secret)
111110
decoded_payload = jwt.decode(jwt_message, verify=False)
112111
self.assertEqual(decoded_payload, self.payload)
113112

114113
def test_no_secret(self):
115114
right_secret = 'foo'
116-
bad_secret = 'bar'
117115
jwt_message = jwt.encode(self.payload, right_secret)
118116
self.assertRaises(jwt.DecodeError, jwt.decode, jwt_message)
119117

120118
def test_invalid_crypto_alg(self):
121119
self.assertRaises(NotImplementedError, jwt.encode, self.payload, "secret", "HS1024")
122-
123-

‎tests/test_make_request.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
44
Uses the awesome httpbin.org to validate responses
55
"""
6-
try:
7-
import json
8-
except ImportError:
9-
import simplejson as json
10-
11-
126
import twilio
137
from nose.tools import raises
148
from mock import patch, Mock

‎tests/test_phone_numbers.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import unittest
99
else:
1010
import unittest2 as unittest
11-
from mock import Mock, patch
12-
from twilio import TwilioException
11+
from mock import Mock
1312
from twilio.rest.resources import PhoneNumbers
1413
from twilio.rest.resources import PhoneNumber
1514

@@ -55,7 +54,6 @@ def test_sms_application_sid(self):
5554
resource.update_instance.assert_called_with(
5655
"SID", {"sms_application_sid": "foo"})
5756

58-
5957
def test_status_callback_url(self):
6058
resource = PhoneNumbers(self.uri, self.auth)
6159
resource.update_instance = Mock()
@@ -86,8 +84,6 @@ def test_base_uri(self):
8684
entry = json.load(f)
8785
resource.load(entry)
8886

89-
self.assertEquals(resource.parent.base_uri,
87+
self.assertEquals(resource.parent.base_uri,
9088
("https://api.twilio.com/2010-04-01/Accounts/AC4bf2dafbed59a573"
9189
"3d2c1c1c69a83a28"))
92-
93-

0 commit comments

Comments
 (0)
0