8000 python 2.6 compatibility · Twilio-api/twilio-python@644328c · GitHub
[go: up one dir, main page]
Skip to content

Commit 644328c

Browse files
author
Kevin Burke
committed
python 2.6 compatibility
1 parent 6279271 commit 644328c

File tree

4 files changed

+15
-23
lines changed

4 files changed

+15
-23
lines changed

‎tests/test_available_phonenumber.py

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

33
from mock import Mock
4-
from nose.tools import assert_equal
4+
from nose.tools import assert_equal, assert_true
55

66
from twilio import TwilioException
77
from twilio.rest.resources import AvailablePhoneNumber
@@ -28,15 +28,14 @@ def test_purchase(self):
2828
phone_number="+123")
2929

3030

31-
class AvailabePhoneNumbersTest(unittest.TestCase):
31+
class AvailablePhoneNumbersTest(unittest.TestCase):
3232

3333
def setUp(self):
3434
self.resource = AvailablePhoneNumbers("http://api.twilio.com",
3535
("user", "pass"), UNSET_TIMEOUT, Mock())
3636

3737
def test_get(self):
38-
with self.assertRaises(TwilioException):
39-
self.resource.get("PN123")
38+
self.assertRaises(TwilioException, self.resource.get, "PN123")
4039

4140
def test_list(self):
4241
request = Mock()
@@ -50,7 +49,7 @@ def test_list(self):
5049

5150
def test_load_instance(self):
5251
instance = self.resource.load_instance({"hey": "you"})
53-
self.assertIsInstance(instance.parent, Mock)
52+
assert_true(isinstance(instance.parent, Mock))
5453
assert_equal(instance.hey, "you")
5554

5655
def test_purchase_status_callback(self):

‎tests/test_base_resource.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def testIterNoKey(self):
4747
self.r.request = Mock()
4848
self.r.request.return_value = Mock(), {}
4949

50-
with self.assertRaises(StopIteration):
51-
advance_iterator(self.r.iter())
50+
self.assertRaises(StopIteration, advance_iterator, self.r.iter())
5251

5352
def testRequest(self):
5453
self.r.request = Mock()
@@ -63,15 +62,13 @@ def testIterOneItem(self):
6362
items = self.r.iter()
6463
advance_iterator(items)
6564

66-
with self.assertRaises(StopIteration):
67-
advance_iterator(items)
65+
self.assertRaises(StopIteration, advance_iterator, items)
6866

6967
def testIterNoNextPage(self):
7068
self.r.request = Mock()
7169
self.r.request.return_value = Mock(), {self.r.key: []}
7270

73-
with self.assertRaises(StopIteration):
74-
advance_iterator(self.r.iter())
71+
self.assertRaises(StopIteration, advance_iterator, self.r.iter())
7572

7673
def testKeyValue(self):
7774
self.r.key = "Hey"
@@ -80,7 +77,7 @@ def testKeyValue(self):
8077
def testInstanceLoading(self):
8178
instance = self.r.load_instance({"sid": "foo"})
8279

83-
self.assertIsInstance(instance, InstanceResource)
80+
assert_true(isinstance(instance, InstanceResource))
8481
assert_equal(instance.sid, "foo")
8582

8683
def testListResourceCreateResponse200(self):

‎tests/test_client.py

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

33
from mock import patch, Mock, sentinel, ANY
4-
from nose.tools import assert_equal
4+
from nose.tools import assert_equal, assert_true
55

66
from twilio.rest.resources.imports import json
77
from twilio.rest import TwilioRestClient, resources
@@ -28,12 +28,11 @@ def test_request(self, mock):
2828
)
2929

3030
def test_connect_apps(self):
31-
self.assertIsInstance(self.client.connect_apps,
32-
resources.ConnectApps)
31+
assert_true(isinstance(self.client.connect_apps, resources.ConnectApps))
3332

3433
def test_authorized_apps(self):
35-
self.assertIsInstance(self.client.authorized_connect_apps,
36-
resources.AuthorizedConnectApps)
34+
assert_true(isinstance(self.client.authorized_connect_apps,
35+
resources.AuthorizedConnectApps))
3736

3837
@patch("twilio.rest.resources.base.make_request")
3938
def test_conferences(self, mock):

‎tests/test_connect_apps.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,10 @@ def test_list(self, mock):
4141
params={}, auth=self 868B .auth)
4242

4343
def test_create(self):
44-
with self.assertRaises(AttributeError):
45-
self.resource.create()
44+
self.assertRaises(AttributeError, getattr, self.resource, 'create')
4645

4746
def test_delete(self):
48-
with self.assertRaises(AttributeError):
49-
self.resource.delete()
47+
self.assertRaises(AttributeError, getattr, self.resource, 'delete')
5048

5149
def test_update(self):
52-
with self.assertRaises(AttributeError):
53-
self.resource.update()
50+
self.assertRaises(AttributeError, getattr, self.resource, 'update')

0 commit comments

Comments
 (0)
0