Tidied up imports

Much tidier like this. No more DRY violations!

Author: Paul Hallett

twilio/rest/__init__.py

@@ -3,29 +3,12 @@
 import platform
 from .. import TwilioException
 from .. import __version__ as LIBRARY_VERSION
-from .resources import make_request
-from .resources import Accounts
-from .resources import Applications
-from .resources import AuthorizedConnectApps
-from .resources import CallerIds
-from .resources import Calls
-from .resources import Conferences
-from .resources import ConnectApps
-from .resources import Connection
-from .resources import MediaList
-from .resources import Members
-from .resources import Messages
-from .resources import Notifications
-from .resources import Participants
-from .resources import PhoneNumbers
-from .resources import Queues
-from .resources import Recordings
-from .resources import Sandboxes
-from .resources import Sip
-from .resources import Sms
-from .resources import Transcriptions
-from .resources import UNSET_TIMEOUT
-from .resources import Usage
+from .resources import (
+    make_request, Accounts, Applications, AuthorizedConnectApps,
+    CallerIds, Calls, Conferences, ConnectApps, Connection, MediaList,
+    Members, Messages, Notifications, Participants, PhoneNumbers, Queues,
+    Recordings, Sandboxes, Sip, Sms, Transcriptions, UNSET_TIMEOUT, Usage
+)
 
 
 def find_credentials(environ=None):

twilio/rest/resources/base.py

@@ -2,14 +2,18 @@
 import os
 import platform
 
-from six import integer_types, string_types, binary_type, iteritems
+from six import (
+    integer_types, string_types, binary_type, iteritems
+)
 from ...compat import urlparse
 from ...compat import urlencode
 
 from ... import __version__, TwilioException, TwilioRestException
 from .connection import Connection
 from .imports import parse_qs, httplib2, json
-from .util import transform_params, parse_rfc2822_date, UNSET_TIMEOUT
+from .util import (
+    transform_params, parse_rfc2822_date, UNSET_TIMEOUT
+)
 
 
 class Response(object):

twilio/rest/resources/connection.py

@@ -1,8 +1,7 @@
-from .imports import httplib2
-from .imports import socks
-from .imports import PROXY_TYPE_HTTP
-from .imports import PROXY_TYPE_SOCKS4
-from .imports import PROXY_TYPE_SOCKS5
+from .imports import (
+    httplib2, socks, PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4,
+    PROXY_TYPE_SOCKS5
+)
 
 
 class Connection(object):

twilio/rest/resources/imports.py

@@ -19,11 +19,11 @@
 # socks
 try:
     from httplib2 import socks
-    from httplib2.socks import PROXY_TYPE_HTTP
-    from httplib2.socks import PROXY_TYPE_SOCKS4
-    from httplib2.socks import PROXY_TYPE_SOCKS5
+    from httplib2.socks import (
+        PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5
+    )
 except ImportError:
     import socks
-    from socks import PROXY_TYPE_HTTP
-    from socks import PROXY_TYPE_SOCKS4
-    from socks import PROXY_TYPE_SOCKS5
+    from socks import (
+        PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5
+    )

twilio/rest/resources/sip/__init__.py

@@ -1,10 +1,8 @@
-from .credential_lists import Credentials
-from .credential_lists import SipCredentialLists
-from .domains import CredentialListMappings
-from .domains import IpAccessControlListMappings
-from .domains import Domains
-from .ip_access_control_lists import IpAddresses
-from .ip_access_control_lists import SipIpAccessControlLists
+from .credential_lists import Credentials, SipCredentialLists
+from .domains import (
+    CredentialListMappings, IpAccessControlListMappings, Domains
+)
+from .ip_access_control_lists import IpAddresses, SipIpAccessControlLists
 
 
 class Sip(object):