Vendor six.py

setup.py

@@ -17,8 +17,6 @@
 
 install_requires = []
 
-install_requires.append('six')
-
 if sys.version_info < (2, 6):
     warnings.warn(
         'Python 2.5 is no longer officially supported by Stripe. '

stripe/api_requestor.py

@@ -4,12 +4,10 @@
 import time
 import warnings
 
-import six
-from six.moves.urllib.parse import urlencode, urlsplit, urlunsplit
-
 import stripe
-from stripe import error, oauth_error, http_client, version, util
+from stripe import error, oauth_error, http_client, version, util, six
 from stripe.multipart_data_generator import MultipartDataGenerator
+from stripe.six.moves.urllib.parse import urlencode, urlsplit, urlunsplit
 
 
 def _encode_datetime(dttime):

stripe/api_resources/abstract/api_resource.py

@@ -1,8 +1,6 @@
-import six
-from six.moves.urllib.parse import quote_plus
-
-from stripe import error, util
+from stripe import error, util, six
 from stripe.stripe_object import StripeObject
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class APIResource(StripeObject):

stripe/api_resources/abstract/nested_resource_class_methods.py

@@ -1,6 +1,5 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import api_requestor, util
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 def nested_resource_class_methods(resource, path=None, operations=None):

stripe/api_resources/abstract/updateable_api_resource.py

@@ -1,7 +1,6 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import api_requestor, util
 from stripe.api_resources.abstract.api_resource import APIResource
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class UpdateableAPIResource(APIResource):

stripe/api_resources/account.py

@@ -1,12 +1,12 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import oauth, util
 from stripe.api_resources.abstract import CreateableAPIResource
 from stripe.api_resources.abstract import DeletableAPIResource
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
 from stripe.api_resources.abstract import nested_resource_class_methods
 
+from stripe.six.moves.urllib.parse import quote_plus
+
 
 @nested_resource_class_methods(
     'external_account',

stripe/api_resources/alipay_account.py

@@ -1,10 +1,10 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.api_resources.customer import Customer
 from stripe.api_resources.abstract import DeletableAPIResource
 from stripe.api_resources.abstract import UpdateableAPIResource
 
+from stripe.six.moves.urllib.parse import quote_plus
+
 
 class AlipayAccount(UpdateableAPIResource, DeletableAPIResource):
     OBJECT_NAME = 'alipay_account'

stripe/api_resources/application_fee_refund.py

@@ -1,9 +1,9 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.api_resources import ApplicationFee
 from stripe.api_resources.abstract import UpdateableAPIResource
 
+from stripe.six.moves.urllib.parse import quote_plus
+
 
 class ApplicationFeeRefund(UpdateableAPIResource):
     OBJECT_NAME = 'fee_refund'

stripe/api_resources/bank_account.py

@@ -1,11 +1,10 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import error, util
 from stripe.api_resources.account import Account
 from stripe.api_resources.customer import Customer
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import DeletableAPIResource
 from stripe.api_resources.abstract import VerifyMixin
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class BankAccount(UpdateableAPIResource, DeletableAPIResource, VerifyMixin):

stripe/api_resources/bitcoin_receiver.py

@@ -1,11 +1,10 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.api_resources.customer import Customer
 from stripe.api_resources.abstract import CreateableAPIResource
 from stripe.api_resources.abstract import DeletableAPIResource
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class BitcoinReceiver(CreateableAPIResource, UpdateableAPIResource,

stripe/api_resources/card.py

@@ -1,11 +1,10 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import error, util
 from stripe.api_resources.account import Account
 from stripe.api_resources.customer import Customer
 from stripe.api_resources.recipient import Recipient
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import DeletableAPIResource
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class Card(UpdateableAPIResource, DeletableAPIResource):

stripe/api_resources/list_object.py

@@ -1,10 +1,10 @@
 import warnings
 
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.stripe_object import StripeObject
 
+from stripe.six.moves.urllib.parse import quote_plus
+
 
 class ListObject(StripeObject):
     OBJECT_NAME = 'list'

stripe/api_resources/reversal.py

@@ -1,8 +1,7 @@
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.api_resources.transfer import Transfer
 from stripe.api_resources.abstract import UpdateableAPIResource
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class Reversal(UpdateableAPIResource):

stripe/api_resources/source.py

@@ -1,12 +1,11 @@
 import warnings
 
-from six.moves.urllib.parse import quote_plus
-
 from stripe import util
 from stripe.api_resources import Customer
 from stripe.api_resources.abstract import CreateableAPIResource
 from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import VerifyMixin
+from stripe.six.moves.urllib.parse import quote_plus
 
 
 class Source(CreateableAPIResource, UpdateableAPIResource, VerifyMixin):

stripe/error.py

@@ -1,5 +1,4 @@
-# Exceptions
-import six
+from stripe import six
 
 
 class StripeError(Exception):

stripe/http_client.py

@@ -4,16 +4,14 @@
 import warnings
 import email
 
-import six
-
-from stripe import error, util
+from stripe import error, util, six
 
 # - Requests is the preferred HTTP library
 # - Google App Engine has urlfetch
 # - Use Pycurl if it's there (at least it verifies SSL certs)
 # - Fall back to urllib2 with a warning if needed
 try:
-    from six.moves import urllib
+    from stripe.six.moves import urllib
 except ImportError:
     # Try to load in urllib2, but don't sweat it if it's not available.
     pass
@@ -54,7 +52,7 @@
     urlfetch = None
 
 # proxy support for the pycurl client
-from six.moves.urllib.parse import urlparse
+from stripe.six.moves.urllib.parse import urlparse
 
 
 def new_default_http_client(*args, **kwargs):

stripe/multipart_data_generator.py

@@ -1,7 +1,7 @@
 import random
 import io
 
-import six
+from stripe import six
 
 
 class MultipartDataGenerator(object):

stripe/oauth.py

@@ -1,6 +1,5 @@
-from six.moves.urllib.parse import urlencode
-
 from stripe import api_requestor, connect_api_base, error
+from stripe.six.moves.urllib.parse import urlencode
 
 
 class OAuth(object):