From 02f3406d54e295dc3ff58592aa080441dd8d15fd Mon Sep 17 00:00:00 2001 From: Paul Hallett Date: Sun, 10 Aug 2014 14:19:22 +0100 Subject: [PATCH 1/2] Tidied up imports Much tidier like this. No more DRY violations! --- twilio/rest/__init__.py | 29 ++++++--------------------- twilio/rest/resources/base.py | 8 ++++++-- twilio/rest/resources/connection.py | 9 ++++----- twilio/rest/resources/imports.py | 12 +++++------ twilio/rest/resources/sip/__init__.py | 12 +++++------ 5 files changed, 27 insertions(+), 43 deletions(-) diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py index 5ebbe15ff5..87577d3354 100644 --- a/twilio/rest/__init__.py +++ b/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): diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py index 07e00175a3..0f7039eb37 100644 --- a/twilio/rest/resources/base.py +++ b/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): diff --git a/twilio/rest/resources/connection.py b/twilio/rest/resources/connection.py index 29b369892e..4b234e780d 100644 --- a/twilio/rest/resources/connection.py +++ b/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): diff --git a/twilio/rest/resources/imports.py b/twilio/rest/resources/imports.py index 630460a3cb..e875c342e7 100644 --- a/twilio/rest/resources/imports.py +++ b/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 + ) diff --git a/twilio/rest/resources/sip/__init__.py b/twilio/rest/resources/sip/__init__.py index 493bd48998..7085df953c 100644 --- a/twilio/rest/resources/sip/__init__.py +++ b/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): From 54ba90647aa66b4c5930b2e77e866847d3e7aee6 Mon Sep 17 00:00:00 2001 From: Paul Hallett Date: Sat, 16 Aug 2014 13:28:28 +0100 Subject: [PATCH 2/2] Sorted to one input per line --- twilio/rest/__init__.py | 27 +++++++++++++++++++++++---- twilio/rest/resources/base.py | 9 +++++++-- twilio/rest/resources/connection.py | 5 ++++- twilio/rest/resources/imports.py | 8 ++++++-- twilio/rest/resources/sip/__init__.py | 4 +++- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py index 87577d3354..4a4d543859 100644 --- a/twilio/rest/__init__.py +++ b/twilio/rest/__init__.py @@ -4,10 +4,29 @@ from .. import TwilioException from .. import __version__ as LIBRARY_VERSION 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 + 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 ) diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py index 0f7039eb37..072d91ff9f 100644 --- a/twilio/rest/resources/base.py +++ b/twilio/rest/resources/base.py @@ -3,7 +3,10 @@ import platform from six import ( - integer_types, string_types, binary_type, iteritems + integer_types, + string_types, + binary_type, + iteritems ) from ...compat import urlparse from ...compat import urlencode @@ -12,7 +15,9 @@ from .connection import Connection from .imports import parse_qs, httplib2, json from .util import ( - transform_params, parse_rfc2822_date, UNSET_TIMEOUT + transform_params, + parse_rfc2822_date, + UNSET_TIMEOUT ) diff --git a/twilio/rest/resources/connection.py b/twilio/rest/resources/connection.py index 4b234e780d..09b6910b55 100644 --- a/twilio/rest/resources/connection.py +++ b/twilio/rest/resources/connection.py @@ -1,5 +1,8 @@ from .imports import ( - httplib2, socks, PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, + httplib2, + socks, + PROXY_TYPE_HTTP, + PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5 ) diff --git a/twilio/rest/resources/imports.py b/twilio/rest/resources/imports.py index e875c342e7..a74bc41dea 100644 --- a/twilio/rest/resources/imports.py +++ b/twilio/rest/resources/imports.py @@ -20,10 +20,14 @@ try: from httplib2 import socks from httplib2.socks import ( - PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5 + PROXY_TYPE_HTTP, + PROXY_TYPE_SOCKS4, + PROXY_TYPE_SOCKS5 ) except ImportError: import socks from socks import ( - PROXY_TYPE_HTTP, PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5 + PROXY_TYPE_HTTP, + PROXY_TYPE_SOCKS4, + PROXY_TYPE_SOCKS5 ) diff --git a/twilio/rest/resources/sip/__init__.py b/twilio/rest/resources/sip/__init__.py index 7085df953c..b4a349850c 100644 --- a/twilio/rest/resources/sip/__init__.py +++ b/twilio/rest/resources/sip/__init__.py @@ -1,6 +1,8 @@ from .credential_lists import Credentials, SipCredentialLists from .domains import ( - CredentialListMappings, IpAccessControlListMappings, Domains + CredentialListMappings, + IpAccessControlListMappings, + Domains ) from .ip_access_control_lists import IpAddresses, SipIpAccessControlLists