8000 Tidied up imports · madCode/twilio-python@02f3406 · GitHub
[go: up one dir, main page]
Skip to content

Commit 02f3406

Browse files
author
Paul Hallett
committed
Tidied up imports
Much tidier like this. No more DRY violations!
1 parent 4d18ca3 commit 02f3406

File tree

5 files changed

+27
-43
lines changed

5 files changed

+27
-43
lines changed

‎twilio/rest/__init__.py

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,12 @@
33
import platform
44
from .. import TwilioException
55
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
6+
from .resources import (
7+
make_request, Accounts, Applications, AuthorizedConnectApps,
8+
CallerIds, Calls, Conferences, ConnectApps, Connection, MediaList,
9+
Members, Messages, Notifications, Participants, PhoneNumbers, Queues,
10+
Recordings, Sandboxes, Sip, Sms, Transcriptions, UNSET_TIMEOUT, Usage
11+
)
2912

3013

3114
def find_credentials(environ=None):

‎twilio/rest/resources/base.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
import os
33
import platform
44

5-
from six import integer_types, string_types, binary_type, iteritems
5+
from six import (
6+
integer_types, string_types, binary_type, iteritems
7+
)
68
from ...compat import urlparse
79
from ...compat import urlencode
810

911
from ... import __version__, TwilioException, TwilioRestException
1012
from .connection import Connection
1113
from .imports import parse_qs, httplib2, json
12-
from .util import transform_params, parse_rfc2822_date, UNSET_TIMEOUT
14+
from .util import (
15+
transform_params, parse_rfc2822_date, UNSET_TIMEOUT
16+
)
1317

1418

1519
class Response(object):

‎twilio/rest/resources/connection.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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
1+
from .imports import (
2+
httplib2, socks, PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4,
3+
PROXY_TYPE_SOCKS5
4+
)
65

76

87
class Connection(object):

‎twilio/rest/resources/imports.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
# socks
2020
try:
2121
from httplib2 import socks
22-
from httplib2.socks import PROXY_TYPE_HTTP
23-
from httplib2.socks import PROXY_TYPE_SOCKS4
24-
from httplib2.socks import PROXY_TYPE_SOCKS5
22+
from httplib2.socks import (
23+
PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5
24+
)
2525
except ImportError:
2626
import socks
27-
from socks import PROXY_TYPE_HTTP
28-
from socks import PROXY_TYPE_SOCKS4
29-
from socks import PROXY_TYPE_SOCKS5
27+
from socks import (
28+
PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5
29+
)

‎twilio/rest/resources/sip/__init__.py

Lines changed: 5 additions & 7 deletions
628C
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
from .credential_lists import Credentials
2-
from .credential_lists import SipCredentialLists
3-
from .domains import CredentialListMappings
4-
from .domains import IpAccessControlListMappings
5-
from .domains import Domains
6-
from .ip_access_control_lists import IpAddresses
7-
from .ip_access_control_lists import SipIpAccessControlLists
1+
from .credential_lists import Credentials, SipCredentialLists
2+
from .domains import (
3+
CredentialListMappings, IpAccessControlListMappings, Domains
4+
)
5+
from .ip_access_control_lists import IpAddresses, SipIpAccessControlLists
86

97

108
class Sip(object):

0 commit comments

Comments
 (0)
0