8000 finish vendoring · yikaraman/twilio-python@2b449d8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2b449d8

Browse files
author
Kevin Burke
committed
finish vendoring
1 parent 2e11747 commit 2b449d8

File tree

9 files changed

+78
-83
lines changed

9 files changed

+78
-83
lines changed

‎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 6D40 .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: 21 additions & 22 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

87
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: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
from . 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
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/base.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import sys
55

66
from six import integer_types, string_types, binary_type, iteritems, u
7-
from twilio.compat import urlparse
8-
from twilio.compat import urlencode
7+
from ...compat import urlparse
8+
from ...compat import urlencode
99

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

1715

1816
class Response(object):
@@ -120,7 +118,7 @@ def make_twilio_request(method, uri, **kwargs):
120118
headers = kwargs.get("headers", {})
121119

122120
user_agent = "twilio-python/%s (Python %s)" % (
123-
twilio.__version__,
121+
__version__,
124122
platform.python_version(),
125123
)
126124
headers["User-Agent"] = user_agent

‎twilio/rest/resources/calls.py

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

‎twilio/rest/resources/connection.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from twilio.rest.resources.imports import httplib2
2-
from twilio.rest.resources.imports import socks
3-
from twilio.rest.resources.imports import PROXY_TYPE_HTTP
4-
from twilio.rest.resources.imports import PROXY_TYPE_SOCKS4
5-
from twilio.rest.resources.imports import PROXY_TYPE_SOCKS5
1+
from .imports import httplib2
2+
from .imports import socks
3+
from .imports import PROXY_TYPE_HTTP
4+
from .imports import PROXY_TYPE_SOCKS4
5+
from .imports import PROXY_TYPE_SOCKS5
66

77

88
class Connection(object):

‎twilio/rest/resources/messages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from . import InstanceResource, ListResource
2-
from twilio.rest.resources.media import MediaList
2+
from .media import MediaList
33
from .util import normalize_dates, parse_date
44

55

‎twilio/rest/resources/phone_numbers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
from twilio import TwilioException
3+
from .. import TwilioException
44
from .util import change_dict_key, transform_params
55
from .util import UNSET_TIMEOUT
66
from . import InstanceResource, ListResource

‎twilio/rest/resources/recordings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .util import normalize_dates
22

3-
from twilio.rest.resources.transcriptions import Transcriptions
4-
from twilio.rest.resources.base import InstanceResource, ListResource
3+
from .transcriptions import Transcriptions
4+
from .base import InstanceResource, ListResource
55

66

77
class Recording(InstanceResource):

0 commit comments

Comments
 (0)
0