8000 Merge branch 'release-3.0.2' · sologoub/twilio-python@094f7f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 094f7f6

Browse files
kyleconroykyleconroy
committed
Merge branch 'release-3.0.2'
2 parents 5420e9c + 0d65a06 commit 094f7f6

File tree

7 files changed

+41
-15
lines changed

7 files changed

+41
-15
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ print call.sid
2525

2626
### Generating TwiML
2727

28-
To control phone calls, your application need to output TwiML. Use :class:`twilio.twiml..Response` to easily create such responses.
28+
To control phone calls, your application need to output TwiML. Use `twilio.twiml..Response` to easily create such responses.
2929

3030
```python
3131
from twilio import twiml

â 8000 €Ždocs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
# The short X.Y version.
5757
version = '3.0'
5858
# The full version, including alpha/beta/rc tags.
59-
release = '3.0.1'
59+
release = '3.0.2'
6060

6161
# The language for content autogenerated by Sphinx. Refer to documentation
6262
# for a list of supported languages.

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from setuptools import setup, find_packages
22
setup(
33
name = "twilio",
4-
version = "3.0.1",
4+
version = "3.0.2",
55
description = "Twilio API client and TwiML generator",
66
author = "Twilio",
77
author_email = "help@twilio.com",

‎tests/test_available_phonenumber.py

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,43 @@ def test_load_instance(self):
4949
self.assertIsInstance(instance.parent, Mock)
5050
self.assertEquals(instance.hey, "you")
5151

52+
def test_purchase_status_callback(self):
53+
request = Mock()
54+
request.return_value = (Mock(), {"available_phone_numbers": []})
55+
self.resource.request = request
56+
57+
self.resource.list()
58+
59+
uri = "http://api.twilio.com/AvailablePhoneNumbers/US/Local"
60+
request.assert_called_with("GET", uri, params={})
61+
5262

5363
class PhoneNumbersTest(unittest.TestCase):
5464

55-
def test_reference(self):
56-
base = "http://api.twilio.com"
57-
phone_numbers = PhoneNumbers(base, Mock())
65+
def setUp(self):
66+
self.resource = PhoneNumbers("http://api.twilio.com",
67+
("user", "pass"))
5868

59-
self.assertEquals(phone_numbers.available_phone_numbers.phone_numbers,
60-
phone_numbers)
69+
def test_reference(self):
70+
self.assertEquals(self.resource.available_phone_numbers.phone_numbers,
71+
self.resource)
6172

73+
def test_purchase_status_callback(self):
74+
request = Mock()
75+
response = Mock()
76+
response.status_code = 201
77+
request.return_value = (response, {"sid": ""})
78+
self.resource.request = request
6279

80+
self.resource.purchase(area_code="530", status_callback_url="http://",
81+
status_callback_method="POST")
6382

83+
uri = "http://api.twilio.com/IncomingPhoneNumbers"
6484

85+
data = {
86+
"AreaCode": "530",
87+
"StatusCallback": "http://",
88+
"StatusCallbackMethod": "POST",
89+
}
6590

91+
request.assert_called_with("POST", uri, data=data)

‎twilio/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
__version_info__ = ('3', '0', '1')
1+
__version_info__ = ('3', '0', '2')
22
__version__ = '.'.join(__version_info__)
33

4+
45
class TwilioException(Exception):
56
pass
67

‎twilio/rest/resources.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import base64
21
import datetime
32
import logging
4-
import re
5-
import os
6-
import urllib
73

84
from twilio import TwilioException
95
from twilio import TwilioRestException
@@ -781,7 +777,8 @@ def list(self, phone_number=None, friendly_name=None, **kwargs):
781777

782778
def purchase(self, phone_number=None, area_code=None, voice_url=None,
783779
voice_method=None, voice_fallback_url=None,
784-
voice_fallback_method=None, status_callback_method=None,
780+
voice_fallback_method=None,
781+
status_callback_url=None, status_callback_method=None,
785782
sms_url=None, sms_method=None, sms_fallback_url=None,
786783
sms_fallback_method=None, voice_caller_id_lookup=None,
787784
account_sid=None, application_sid=None):
@@ -801,6 +798,8 @@ def purchase(self, phone_number=None, area_code=None, voice_url=None,
801798
"SmsMethod": sms_method,
802799
"SmsFallbackUrl": sms_fallback_url,
803800
"SmsFallbackMethod": sms_fallback_method,
801+
"StatusCallback": status_callback_url,
802+
"StatusCallbackMethod": status_callback_method,
804803
"VoiceCallerIdLookup": voice_caller_id_lookup,
805804
"AccountSid": account_sid,
806805
"ApplicationSid": application_sid,

‎twilio/twiml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class Sms(Verb):
319319
""" Send a Sms Message to a phone number
320320
321321
:param to: whom to send message to
322-
:param from_: whom to send message from.
322+
:param sender: whom to send message from.
323323
:param action: url to request after the message is queued
324324
:param method: submit to 'action' url using GET or POST
325325
:param statusCallback: url to hit when the message is actually sent

0 commit comments

Comments
 (0)
0