Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Tidied up imports #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2014
Merged

Tidied up imports #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f3406
Tidied up imports
Aug 10, 2014
54ba906
Sorted to one input per line
Aug 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions twilio/rest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,31 @@
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):
Expand Down
13 changes: 11 additions & 2 deletions twilio/rest/resources/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,23 @@
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):
Expand Down
12 changes: 7 additions & 5 deletions twilio/rest/resources/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
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):
Expand Down
16 changes: 10 additions & 6 deletions twilio/rest/resources/imports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@
# 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
)
14 changes: 7 additions & 7 deletions twilio/rest/resources/sip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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):
Expand Down