8000 kill all references to unittest2 · Twilio-api/twilio-python@052c290 · GitHub
[go: up one dir, main page]
Skip to content

Commit 052c290

Browse files
author
Kevin Burke
committed
kill all references to unittest2
1 parent 63fc0d8 commit 052c290

14 files changed

+141
-183
lines changed

‎setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
if sys.version_info >= (3,0):
1717
REQUIRES.append('unittest2py3k')
1818
REQUIRES.append('socksipy-branch')
19-
else:
20-
REQUIRES.append('unittest2')
2119

2220
setup(
2321
name = "twilio",

‎tests/test_available_phonenumber.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
from __future__ import with_statement
2-
3-
import six
4-
if six.PY3:
5-
import unittest
6-
else:
7-
import unittest2 as unittest
1+
import unittest
82

93
from mock import Mock
4+
from nose.tools import assert_equal
5+
106
from twilio import TwilioException
117
from twilio.rest.resources import AvailablePhoneNumber
128
from twilio.rest.resources import AvailablePhoneNumbers
@@ -21,7 +17,7 @@ def setUp(self):
2117
self.instance = AvailablePhoneNumber(self.parent)
2218

2319
def test_init(self):
24-
self.assertEquals(self.instance.name, "")
20+
assert_equal(self.instance.name, "")
2521

2622
def test_purchase(self):
2723
self.instance.phone_number = "+123"
@@ -55,7 +51,7 @@ def test_list(self):
5551
def test_load_instance(self):
5652
instance = self.resource.load_instance({"hey": "you"})
5753
self.assertIsInstance(instance.parent, Mock)
58-
self.assertEquals(instance.hey, "you")
54+
assert_equal(instance.hey, "you")
5955

6056
def test_purchase_status_callback(self):
6157
request = Mock()
@@ -85,8 +81,8 @@ def setUp(self):
8581
("user", "pass"))
8682

8783
def test_reference(self):
88-
self.assertEquals(self.resource.available_phone_numbers.phone_numbers,
89-
self.resource)
84+
assert_equal(self.resource.available_phone_numbers.phone_numbers,
85+
self.resource)
9086

9187
def test_purchase_status_callback(self):
9288
request = Mock()

‎tests/test_base_resource.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
# -*- coding: utf-8 -*-
2-
from __future__ import with_statement
3-
import six
4-
if six.PY3:
5-
import unittest
6-
else:
7-
import unittest2 as unittest
2+
import unittest
83

94
from mock import Mock, sentinel, patch, ANY
105
from nose.tools import assert_equal, assert_true
6+
from six import advance_iterator
7+
118
from twilio.rest.resources.imports import json
129
from twilio.rest.resources import Resource
1310
from twilio.rest.resources import ListResource
1411
from twilio.rest.resources import InstanceResource
15-
from six import advance_iterator
1612

1713
base_uri = "https://api.twilio.com/2010-04-01"
1814
account_sid = "AC123"
@@ -42,10 +38,10 @@ def setUp(self):
4238

4339
def testListResourceInit(self):
4440
uri = "%s/%s" % (base_uri, self.r.name)
45-
self.assertEquals(self.r.uri, uri)
41+
assert_equal(self.r.uri, uri)
4642

4743
def testKeyValueLower(self):
48-
self.assertEquals(self.r.key, self.r.name.lower())
44+
assert_equal(self.r.key, self.r.name.lower())
4945

5046
def testIterNoKey(self):
5147
self.r.request = Mock()
@@ -79,13 +75,13 @@ def testIterNoNextPage(self):
7975

8076
def testKeyValue(self):
8177
self.r.key = "Hey"
82-
self.assertEquals(self.r.key, "Hey")
78+
assert_equal(self.r.key, "Hey")
8379

8480
def testInstanceLoading(self):
8581
instance = self.r.load_instance({"sid": "foo"})
8682

8783
self.assertIsInstance(instance, InstanceResource)
88-
self.assertEquals(instance.sid, "foo")
84+
assert_equal(instance.sid, "foo")
8985

9086
def testListResourceCreateResponse200(self):
9187
"""We should accept 200 OK in response to a POST creating a resource."""
@@ -114,16 +110,16 @@ def setUp(self):
114110
self.uri = "%s/%s" % (self.parent.uri, "123")
115111

116112
def testInit(self):
117-
self.assertEquals(self.r.uri, self.uri)
113+
assert_equal(self.r.uri, self.uri)
118114

119115
def testLoad(self):
120116
self.r.load({"hey": "you"})
121-
self.assertEquals(self.r.hey, "you")
117+
assert_equal(self.r.hey, "you")
122118

123119
def testLoadWithUri(self):
124120
self.r.load({"hey": "you", "uri": "foobar"})
125-
self.assertEquals(self.r.hey, "you")
126-
self.assertEquals(self.r.uri, self.uri)
121+
assert_equal(self.r.hey, "you")
122+
assert_equal(self.r.uri, self.uri)
127123

128124
def testLoadDateCreated(self):
129125
self.r.load({"date_created": "Sat, 29 Sep 2012 12:47:54 +0000",
@@ -140,7 +136,7 @@ def testLoadNullDate(self):
140136

141137
def testLoadWithFrom(self):
142138
self.r.load({"from": "foo"})
143-
self.assertEquals(self.r.from_, "foo")
139+
assert_equal(self.r.from_, "foo")
144140

145141
def testLoadSubresources(self):
146142
m = Mock()
@@ -162,8 +158,8 @@ def testPassThrough(self, mock_request):
162158
mock_response.content = json.dumps({'key': 'value'})
163159
mock_request.return_value = mock_response
164160

165-
self.assertEquals(self.r.timeout, sentinel.timeout)
166-
self.assertEquals((mock_response, {'key': 'value'}), self.r.request('GET', base_uri))
161+
assert_equal(self.r.timeout, sentinel.timeout)
162+
assert_equal((mock_response, {'key': 'value'}), self.r.request('GET', base_uri))
167163

168164
mock_request.assert_called_once_with(
169165
'GET',

‎tests/test_client.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import six
2-
if six.PY3:
3-
import unittest
4-
else:
5-
import unittest2 as unittest
1+
import unittest
2+
3+
from mock import patch, Mock, sentinel, ANY
4+
from nose.tools import assert_equal
65

76
from twilio.rest.resources.imports import json
87
from twilio.rest import TwilioRestClient, resources
9-
from mock import patch, Mock, sentinel, ANY
108
from tools import create_mock_json
119

1210
AUTH = ("ACCOUNT_SID", "AUTH_TOKEN")
@@ -70,5 +68,5 @@ def test_arbitrary_member(self, mock_request):
7068
mock_response.ok = True
7169
mock_response.content = json.dumps({"short_codes": []})
7270
mock_request.return_value = mock_response
73-
self.assertEqual([], self.client.sms.short_codes.list())
71+
assert_equal([], self.client.sms.short_codes.list())
7472
mock_request.assert_called_once_with("GET", ANY, params=ANY, auth=AUTH, timeout=sentinel.timeout)

‎tests/test_conferences.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import six
2-
if six.PY3:
3-
import unittest
4-
else:
5-
import unittest2 as unittest
6-
71
from datetime import date
2+
import unittest
3+
84
from mock import Mock
95
from twilio.rest.resources import Conferences
106

@@ -15,7 +11,7 @@
1511
'DateCreated<': None,
1612
'DateCreated>': None,
1713
'DateCreated': None,
18-
}
14+
}
1915

2016

2117
class ConferenceTest(unittest.TestCase):

‎tests/test_connect_apps.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
from __future__ import with_statement
2-
import six
3-
if six.PY3:
4-
import unittest
5-
else:
6-
import unittest2 as unittest
1+
import unittest
72

83
from mock import Mock, patch
4+
95
from twilio.rest.resources import ConnectApps
106

117

‎tests/test_core.py

Lines changed: 22 additions & 23 deletions
< 10000 tr class="diff-line-row">
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import six
2-
if six.PY3:
3-
import unittest
4-
else:
5-
import unittest2 as unittest
61
from datetime import datetime
72
from datetime import date
3+
import unittest
4+
5+
from nose.tools import assert_equal
6+
87
from twilio.rest.resources import parse_date
98
from twilio.rest.resources import transform_params
109
from twilio.rest.resources import convert_keys
@@ -17,38 +16,38 @@ class CoreTest(unittest.TestCase):
1716

1817
def test_date(self):
1918
d = date(2009, 10, 10)
20-
self.assertEquals(parse_date(d), "2009-10-10")
19+
assert_equal(parse_date(d), "2009-10-10")
2120

2221
def test_datetime(self):
2322
d = datetime(2009, 10, 10)
24-
self.assertEquals(parse_date(d), "2009-10-10")
23+
assert_equal(parse_date(d), "2009-10-10")
2524

2625
def test_string_date(self):
2726
d = "2009-10-10"
28-
self.assertEquals(parse_date(d), "2009-10-10")
27+
assert_equal(parse_date(d), "2009-10-10")
2928

3029
def test_string_date_none(self):
3130
d = None
32-
self.assertEquals(parse_date(d), None)
31+
assert_equal(parse_date(d), None)
3332

3433
def test_string_date_false(self):
3534
d = False
36-
self.assertEquals(parse_date(d), None)
35+
assert_equal(parse_date(d), None)
3736

3837
def test_fparam(self):
3938
d = {"HEY": None, "YOU": 3}
4039
ed = {"YOU": 3}
41-
self.assertEquals(transform_params(d), ed)
40+
assert_equal(transform_params(d), ed)
4241

4342
def test_multi_param(self):
4443
d = {"Normal": 3, "Multiple": ["One", "Two"]}
4544
ed = {"Normal": 3, "Multiple": ["One", "Two"]}
46-
self.assertEquals(transform_params(d), ed)
45+
assert_equal(transform_params(d), ed)
4746

4847
def test_fparam_booleans(self):
4948
d = {"HEY": None, "YOU": 3, "Activated": False}
5049
ed = {"YOU": 3, "Activated": "false"}
51-
self.assertEquals(transform_params(d), ed)
50+
assert_equal(transform_params(d), ed)
5251

5352
def test_normalize_dates(self):
5453

@@ -63,19 +62,19 @@ def foo(on=None, before=None, after=None):
6362
d = foo(on="2009-10-10", before=date(2009, 10, 10),
6463
after=datetime(2009, 10, 10))
6564

66-
self.assertEquals(d["on"], "2009-10-10")
67-
self.assertEquals(d["after"], "2009-10-10")
68-
self.assertEquals(d["before"], "2009-10-10")
65+
assert_equal(d["on"], "2009-10-10")
66+
assert_equal(d["after"], "2009-10-10")
67+
assert_equal(d["before"], "2009-10-10")
6968

7069
def test_convert_case(self):
71-
self.assertEquals(convert_case("from_"), "From")
72-
self.assertEquals(convert_case("to"), "To")
73-
self.assertEquals(convert_case("friendly_name"), "FriendlyName")
70+
assert_equal(convert_case("from_"), "From")
71+
assert_equal(convert_case("to"), "To")
72+
assert_equal(convert_case("friendly_name"), "FriendlyName")
7473

7574
def test_convert_bool(self):
76-
self.assertEquals(convert_boolean(False), "false")
77-
self.assertEquals(convert_boolean(True), "true")
78-
self.assertEquals(convert_boolean(1), 1)
75+
assert_equal(convert_boolean(False), "false")
76+
assert_equal(convert_boolean(True), "true")
77+
assert_equal(convert_boolean(1), 1)
7978

8079
def test_convert_keys(self):
8180
d = {
@@ -92,4 +91,4 @@ def test_convert_keys(self):
9291
"EndTime": 0,
9392
}
9493

95-
self.assertEquals(ed, convert_keys(d))
94+
assert_equal(ed, convert_keys(d))

‎tests/test_jwt.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
import time
2-
from twilio import jwt
3-
import six
4-
if six.PY3:
5-
import unittest
6-
else:
7-
import unittest2 as unittest
2+
import unittest
3+
4+
from nose.tools import assert_true, assert_equal
85

6+
from twilio import jwt
97
from twilio.util import TwilioCapability
108

119

1210
class JwtTest(unittest.TestCase):
1311

1412
def assertIn(self, foo, bar, msg=None):
1513
"""backport for 2.6"""
16-
return self.assertTrue(foo in bar, msg=(msg or "%s not found in %s"
14+
return assert_true(foo in bar, msg=(msg or "%s not found in %s"
1715
% (foo, bar)))
1816

1917
def test_no_permissions(self):
2018
token = TwilioCapability("AC123", "XXXXX")
2119
payload = token.payload()
22-
self.assertEquals(len(payload), 1)
23-
self.assertEquals(payload["scope"], '')
20+
assert_equal(len(payload), 1)
21+
assert_equal(payload["scope"], '')
2422

2523
def test_inbound_permissions(self):
2624
token = TwilioCapability("AC123", "XXXXX")
2725
token.allow_client_incoming("andy")
2826
payload = token.payload()
2927

3028
eurl = "scope:client:incoming?clientName=andy"
31-
self.assertEquals(len(payload), 1)
32-
self.assertEquals(payload['scope'], eurl)
29+
assert_equal(len(payload), 1)
30+
assert_equal(payload['scope'], eurl)
3331

3432
def test_outbound_permissions(self):
3533
token = TwilioCapability("AC123", "XXXXX")
@@ -38,7 +36,7 @@ def test_outbound_permissions(self):
3836

3937
eurl = "scope:client:outgoing?appSid=AP123"
4038

41-
self.assertEquals(len(payload), 1)
39+
assert_equal(len(payload), 1)
4240
self.assertIn(eurl, payload['scope'])
4341

4442
def test_outbound_permissions_params(self):
@@ -47,23 +45,23 @@ def test_outbound_permissions_params(self):
4745
payload = token.payload()
4846

4947
eurl = "scope:client:outgoing?appParams=foobar%3D3&appSid=AP123"
50-
self.assertEquals(payload["scope"], eurl)
48+
assert_equal(payload["scope"], eurl)
5149

5250
def test_events(self):
5351
token = TwilioCapability("AC123", "XXXXX")
5452
token.allow_event_stream()
5553
payload = token.payload()
5654

5755
event_uri = "scope:stream:subscribe?path=%2F2010-04-01%2FEvents"
58-
self.assertEquals(payload["scope"], event_uri)
56+
assert_equal(payload["scope"], event_uri)
5957

6058
def test_events_with_filters(self):
6159
token = TwilioCapability("AC123", "XXXXX")
6260
token.allow_event_stream(foobar="hey")
6361
payload = token.payload()
6462

6563
event_uri = "scope:stream:subscribe?params=foobar%3Dhey&path=%2F2010-04-01%2FEvents"
66-
self.assertEquals(payload["scope"], event_uri)
64+
assert_equal(payload["scope"], event_uri)
6765

6866
def test_decode(self):
6967
token = TwilioCapability("AC123", "XXXXX")

0 commit comments

Comments
 (0)
0