Skip to content

Commit de7f83c

Browse files
author
Kevin Burke
committed
merge master; resolve conflicts
2 parents 92df78d + 2b449d8 commit de7f83c

26 files changed

+122
-125
lines changed

‎setup.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import sys
2-
from twilio.version import __version__
32
from setuptools import setup, find_packages
43

4+
__version__ = None
5+
with open('twilio/version.py') as f:
6+
exec(f.read())
7+
58
# To install the twilio-python library, open a Terminal shell, then run this
69
# file by typing:
710
#

‎twilio/rest/__init__.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import logging
22
import os
33
import platform
4-
from twilio import TwilioException
5-
from twilio import __version__ as LIBRARY_VERSION
6-
from twilio.rest.resources import make_request
7-
from twilio.rest.resources import Accounts
8-
from twilio.rest.resources import Applications
9-
from twilio.rest.resources import AuthorizedConnectApps
10-
from twilio.rest.resources import CallerIds
11-
from twilio.rest.resources import Calls
12-
from twilio.rest.resources import Conferences
13-
from twilio.rest.resources import ConnectApps
14-
from twilio.rest.resources import Connection
15-
from twilio.rest.resources import MediaList
16-
from twilio.rest.resources import Members
17-
from twilio.rest.resources import Messages
18-
from twilio.rest.resources import Notifications
19-
from twilio.rest.resources import Participants
20-
from twilio.rest.resources import PhoneNumbers
21-
from twilio.rest.resources import Queues
22-
from twilio.rest.resources import Recordings
23-
from twilio.rest.resources import Sandboxes
24-
from twilio.rest.resources import Sip
25-
from twilio.rest.resources import Sms
26-
from twilio.rest.resources import Transcriptions
27-
from twilio.rest.resources import UNSET_TIMEOUT
28-
from twilio.rest.resources import Usage
4+
from .. import TwilioException
5+
from .. import __version__ as LIBRARY_VERSION
6+
from .resources import make_request
7+
from .resources import Accounts
8+
from .resources import Applications
9+
from .resources import AuthorizedConnectApps
10+
from .resources import CallerIds
11+
from .resources import Calls
12+
from .resources import Conferences
13+
from .resources import ConnectApps
14+
from .resources import Connection
15+
from .resources import MediaList
16+
from .resources import Members
17+
from .resources import Messages
18+
from .resources import Notifications
19+
from .resources import Participants
20+
from .resources import PhoneNumbers
21+
from .resources import Queues
22+
from .resources import Recordings
23+
from .resources import Sandboxes
24+
from .resources import Sip
25+
from .resources import Sms
26+
from .resources import Transcriptions
27+
from .resources import UNSET_TIMEOUT
28+
from .resources import Usage
2929

3030

3131
def find_credentials(environ=None):

‎twilio/rest/resources/__init__.py‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,48 @@
1-
import twilio
2-
from twilio import TwilioException, TwilioRestException
1+
from ... import TwilioException, TwilioRestException
32

4-
from twilio.rest.resources.imports import (
3+
from .imports import (
54
parse_qs, json, httplib2
65
)
76

8-
from twilio.rest.resources.util import (
7+
from .util import (
98
transform_params, format_name, parse_date, convert_boolean, convert_case,
109
convert_keys, normalize_dates, UNSET_TIMEOUT
1110
)
12-
from twilio.rest.resources.base import (
11+
from .base import (
1312
Response, Resource, InstanceResource, ListResource,
1413
make_request, make_twilio_request
1514
)
16-
from twilio.rest.resources.phone_numbers import (
15+
from .phone_numbers import (
1716
AvailablePhoneNumber, AvailablePhoneNumbers, PhoneNumber, PhoneNumbers
1817
)
19-
from twilio.rest.resources.recordings import Recording, Recordings
20-
from twilio.rest.resources.transcriptions import Transcription, Transcriptions
18+
from .recordings import Recording, Recordings
19+
from .transcriptions import Transcription, Transcriptions
2120

22-
from twilio.rest.resources.notifications import Notification, Notifications
23-
from twilio.rest.resources.connect_apps import (
21+
from .notifications import Notification, Notifications
22+
from .connect_apps import (
2423
ConnectApp, ConnectApps, AuthorizedConnectApp, AuthorizedConnectApps
2524
)
26-
from twilio.rest.resources.calls import Call, Calls
27-
from twilio.rest.resources.caller_ids import CallerIds, CallerId
28-
from twilio.rest.resources.connection import Connection
29-
from twilio.rest.resources.sandboxes import Sandbox, Sandboxes
30-
from twilio.rest.resources.sms_messages import (
25+
from .calls import Call, Calls
26+
from .caller_ids import CallerIds, CallerId
27+
from .connection import Connection
28+
from .sandboxes import Sandbox, Sandboxes
29+
from .sms_messages import (
3130
Sms, SmsMessage, SmsMessages, ShortCode, ShortCodes)
32-
from twilio.rest.resources.conferences import (
31+
from .conferences import (
3332
Participant, Participants, Conference, Conferences
3433
)
35-
from twilio.rest.resources.queues import (
34+
from .queues import (
3635
Member, Members, Queue, Queues,
3736
)
38-
from twilio.rest.resources.applications import (
37+
from .applications import (
3938
Application, Applications
4039
)
41-
from twilio.rest.resources.accounts import Account, Accounts
40+
from .accounts import Account, Accounts
4241

43-
from twilio.rest.resources.usage import Usage
42+
from .usage import Usage
4443

45-
from twilio.rest.resources.messages import Message, Messages
44+
from .messages import Message, Messages
4645

47-
from twilio.rest.resources.media import Media, MediaList
46+
from .media import Media, MediaList
4847

49-
from twilio.rest.resources.sip import Sip
48+
from .sip import Sip

‎twilio/rest/resources/accounts.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
from twilio.rest.resources import InstanceResource, ListResource
2-
from twilio.rest.resources.applications import Applications
3-
from twilio.rest.resources.notifications import Notifications
4-
from twilio.rest.resources.recordings import Transcriptions, Recordings
5-
from twilio.rest.resources.calls import Calls
6-
from twilio.rest.resources.sms_messages import Sms
7-
from twilio.rest.resources.caller_ids import CallerIds
8-
from twilio.rest.resources.phone_numbers import PhoneNumbers
9-
from twilio.rest.resources.conferences import Conferences
10-
from twilio.rest.resources.connect_apps import (
11-
ConnectApps, AuthorizedConnectApps
12-
)
13-
from twilio.rest.resources.queues import Queues
14-
from twilio.rest.resources.usage import UsageRecords, UsageTriggers
15-
from twilio.rest.resources.messages import Messages
16-
from twilio.rest.resources.media import MediaList
17-
from twilio.rest.resources.sip import Sip
1+
from . import InstanceResource, ListResource
2+
from .applications import Applications
3+
from .notifications import Notifications
4+
from .recordings import Transcriptions, Recordings
5+
from .calls import Calls
6+
from .sms_messages import Sms
7+
from .caller_ids import CallerIds
8+
from .phone_numbers import PhoneNumbers
9+
from .conferences import Conferences
10+
from .connect_apps import ConnectApps, AuthorizedConnectApps
11+
from .queues import Queues
12+
from .usage import UsageRecords, UsageTriggers
13+
from .messages import Messages
14+
from .media import MediaList
15+
from .sip import Sip
1816

1917

2018
class Account(InstanceResource):

‎twilio/rest/resources/applications.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from twilio.rest.resources import InstanceResource, ListResource
1+
from . import InstanceResource, ListResource
22

33

44
class Application(InstanceResource):

‎twilio/rest/resources/base.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
import platform
44

55
from six import integer_types, string_types, binary_type, iteritems
6-
from twilio.compat import urlparse
7-
from twilio.compat import urlencode
6+
from ...compat import urlparse
7+
from ...compat import urlencode
88

9-
import twilio
10-
from twilio import TwilioException, TwilioRestException
11-
from twilio.rest.resources import UNSET_TIMEOUT
12-
from twilio.rest.resources.connection import Connection
13-
from twilio.rest.resources.imports import parse_qs, httplib2, json
14-
from twilio.rest.resources.util import transform_params, parse_rfc2822_date
9+
from ... import __version__, TwilioException, TwilioRestException
10+
from .connection import Connection
11+
from .imports import parse_qs, httplib2, json
12+
from .util import transform_params, parse_rfc2822_date, UNSET_TIMEOUT
1513

1614

1715
class Response(object):
@@ -119,7 +117,7 @@ def make_twilio_request(method, uri, **kwargs):
119117
headers = kwargs.get("headers", {})
120118

121119
user_agent = "twilio-python/%s (Python %s)" % (
122-
twilio.__version__,
120+
__version__,
123121
platform.python_version(),
124122
)
125123
headers["User-Agent"] = user_agent

‎twilio/rest/resources/caller_ids.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from twilio.rest.resources import transform_params
2-
from twilio.rest.resources import InstanceResource, ListResource
1+
from . import transform_params
2+
from . import InstanceResource, ListResource
33

44

55
class CallerId(InstanceResource):

‎twilio/rest/resources/calls.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from twilio.rest.resources.notifications import Notifications
2-
from twilio.rest.resources.recordings import Recordings
3-
from twilio.rest.resources.util import normalize_dates, parse_date
4-
from twilio.rest.resources import InstanceResource, ListResource
1+
from .notifications import Notifications
2+
from .recordings import Recordings
3+
from .util import normalize_dates, parse_date
4+
from . import InstanceResource, ListResource
55

66

77
class Call(InstanceResource):

‎twilio/rest/resources/conferences.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from twilio.rest.resources.util import parse_date, normalize_dates
2-
from twilio.rest.resources import InstanceResource, ListResource
1+
from .util import parse_date, normalize_dates
2+
from . import InstanceResource, ListResource
33

44

55
class Participant(InstanceResource):

‎twilio/rest/resources/connect_apps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from twilio.rest.resources import InstanceResource, ListResource
1+
from . import InstanceResource, ListResource
22
from six import iteritems
33

44

0 commit comments

Comments
 (0)