8000 Fix test for python 2.x · SBillion/twilio-python@b439c19 · GitHub
[go: up one dir, main page]
Skip to content

Commit b439c19

Browse files
SBillionSBillion
committed
Fix test for python 2.x
1 parent 677c2ac commit b439c19

File tree

3 files changed

+39
-13
lines changed

3 files changed

+39
-13
lines changed

‎tests/lookups/test_client.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import urllib.parse
1+
try:
2+
import urllib.parse
3+
except ImportError:
4+
import urllib
5+
6+
try:
7+
NUMBER_ENCODED = urllib.quote_plus('+15108675309')
8+
except:
9+
NUMBER_ENCODED = urllib.parse.quote_plus('+15108675309')
210

311
from mock import patch
412

@@ -9,10 +17,11 @@
917
@patch("twilio.rest.resources.base.make_twilio_request")
1018
def test_phone_numbers(mock):
1119
client = TwilioLookupsClient("ACCOUNT_SID", "AUTH_TOKEN")
12-
resp = create_mock_json("tests/resources/lookups/phone_number_instance.json")
20+
resp = create_mock_json(
21+
"tests/resources/lookups/phone_number_instance.json")
1322
mock.return_value = resp
14-
number_encode = urllib.parse.quote('+15108675309')
1523
client.phone_numbers.get('+15108675309')
16-
uri = "https://lookups.twilio.com/v1/PhoneNumbers/{}".format(number_encode)
17-
mock.assert_called_with("GET", uri, params={}, auth=("ACCOUNT_SID", "AUTH_TOKEN"),
24+
uri = "https://lookups.twilio.com/v1/PhoneNumbers/{}".format(NUMBER_ENCODED)
25+
mock.assert_called_with("GET", uri, params={},
26+
auth=("ACCOUNT_SID", "AUTH_TOKEN"),
1827
use_json_extension=False)

‎tests/lookups/test_phone_numbers.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import urllib.parse
1+
import urllib
2+
3+
try:
4+
import urllib.parse
5+
except ImportError:
6+
import urllib
27

38
from mock import patch
49

@@ -7,12 +12,13 @@
712
from tests.tools import create_mock_json
813
from twilio.rest.resources.lookups.phone_numbers import PhoneNumbers
914

10-
1115
AUTH = ('AC123', 'foobar')
1216
TIMEOUT = 30
1317
NUMBER = '+15108675309'
14-
NUMBER_ENCODED = urllib.parse.quote(NUMBER)
15-
18+
try:
19+
NUMBER_ENCODED = urllib.quote_plus(NUMBER)
20+
except:
21+
NUMBER_ENCODED = urllib.parse.quote_plus(NUMBER)
1622

1723
@patch("twilio.rest.resources.base.make_twilio_request")
1824
def test_get_phone_number(request):
@@ -24,7 +30,8 @@ def test_get_phone_number(request):
2430
phone_numbers = PhoneNumbers('/v1', AUTH, TIMEOUT)
2531
pn = phone_numbers.get(NUMBER)
2632
assert_equal(pn.phone_number, NUMBER)
27-
request.assert_called_with('GET', '/v1/PhoneNumbers/{}'.format(NUMBER_ENCODED),
33+
request.assert_called_with('GET',
34+
'/v1/PhoneNumbers/{}'.format(NUMBER_ENCODED),
2835
auth=AUTH, timeout=TIMEOUT, params={},
2936
use_json_extension=False)
3037

@@ -39,7 +46,8 @@ def test_get_carrier_info(request):
3946
phone_numbers = PhoneNumbers('/v1', AUTH, TIMEOUT)
4047
pn = phone_numbers.get(NUMBER, include_carrier_info=True)
4148
assert_equal(pn.phone_number, NUMBER)
42-
request.assert_called_with('GET', '/v1/PhoneNumbers/{}'.format(NUMBER_ENCODED),
49+
request.assert_called_with('GET',
50+
'/v1/PhoneNumbers/{}'.format(NUMBER_ENCODED),
4351
auth=AUTH, timeout=TIMEOUT,
4452
params={'Type': 'carrier'},
4553
use_json_extension=False)

‎twilio/rest/resources/lookups/phone_numbers.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
import urllib.parse
21
from twilio.rest.resources import (
32
NextGenInstanceResource,
43
NextGenListResource,
54
transform_params,
65
)
76

7+
try:
8+
import urllib.parse
9+
except ImportError:
10+
import urllib
11+
812

913
class PhoneNumber(NextGenInstanceResource):
1014
"""
@@ -64,7 +68,12 @@ def get(self, number, include_carrier_info=False, country_code=None):
6468
params['type'] = 'carrier'
6569

6670
params = transform_params(params)
67-
uri = "%s/%s" % (self.uri, urllib.parse.quote(number))
71+
72+
try:
73+
number = urllib.quote_plus(number)
74+
except:
75+
number = urllib.parse.quote_plus(number)
76+
uri = "%s/%s" % (self.uri, number)
6877
_, item = self.request("GET", uri, params=params)
6978

7079
return self.load_instance(item)

0 commit comments

Comments
 (0)
0