Skip to content

Commit e012586

Browse files
skimbrelskimbrel
committed
Merge pull request twilio#175 from phalt/import-tidy
Tidied up imports
2 parents 14e13f6 + 54ba906 commit e012586

File tree

5 files changed

+60
-43
lines changed

5 files changed

+60
-43
lines changed

‎twilio/rest/__init__.py

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@
33
import platform
44
from ..exceptions 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,
8+
Accounts,
9+
Applications,
10+
AuthorizedConnectApps,
11+
CallerIds,
12+
Calls,
13+
Conferences,
14+
ConnectApps,
15+
Connection,
16+
MediaList,
17+
Members,
18+
Messages,
19+
Notifications,
20+
Participants,
21+
PhoneNumbers,
22+
Queues,
23+
Recordings,
24+
Sandboxes,
25+
Sip,
26+
Sms,
27+
Transcriptions,
28+
UNSET_TIMEOUT,
29+
Usage
30+
)
2931

3032

3133
def find_credentials(environ=None):

‎twilio/rest/resources/base.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
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,
7+
string_types,
8+
binary_type,
9+
iteritems
10+
)
611
from ...compat import urlparse
712
from ...compat import urlencode
813

@@ -11,7 +16,11 @@
1116
from ..exceptions import TwilioRestException
1217
from .connection import Connection
1318
from .imports import parse_qs, httplib2, json
14-
from .util import transform_params, parse_rfc2822_date, UNSET_TIMEOUT
19+
from .util import (
20+
transform_params,
21+
parse_rfc2822_date,
22+
UNSET_TIMEOUT
23+
)
1524

1625
logger = logging.getLogger('twilio')
1726

‎twilio/rest/resources/connection.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
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,
3+
socks,
4+
PROXY_TYPE_HTTP,
5+
PROXY_TYPE_SOCKS4,
6+
PROXY_TYPE_SOCKS5
7+
)
68

79

810
class Connection(object):

‎twilio/rest/resources/imports.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@
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,
24+
PROXY_TYPE_SOCKS4,
25+
PROXY_TYPE_SOCKS5
26+
)
2527
except ImportError:
2628
import socks
27-
from socks import PROXY_TYPE_HTTP
28-
from socks import PROXY_TYPE_SOCKS4
29-
from socks import PROXY_TYPE_SOCKS5
29+
from socks import (
30+
PROXY_TYPE_HTTP,
31+
PROXY_TYPE_SOCKS4,
32+
PROXY_TYPE_SOCKS5
33+
)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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,
4+
IpAccessControlListMappings,
5+
Domains
6+
)
7+
from .ip_access_control_lists import IpAddresses, SipIpAccessControlLists
88

99

1010
class Sip(object):

0 commit comments

Comments
 (0)