Next major release changes (#845)

stripe/api_resources/__init__.py

@@ -22,15 +22,12 @@
 
 from stripe.api_resources.account import Account
 from stripe.api_resources.account_link import AccountLink
-from stripe.api_resources.alipay_account import AlipayAccount
 from stripe.api_resources.apple_pay_domain import ApplePayDomain
 from stripe.api_resources.application_fee import ApplicationFee
 from stripe.api_resources.application_fee_refund import ApplicationFeeRefund
 from stripe.api_resources.balance import Balance
 from stripe.api_resources.balance_transaction import BalanceTransaction
 from stripe.api_resources.bank_account import BankAccount
-from stripe.api_resources.bitcoin_receiver import BitcoinReceiver
-from stripe.api_resources.bitcoin_transaction import BitcoinTransaction
 from stripe.api_resources.capability import Capability
 from stripe.api_resources.card import Card
 from stripe.api_resources.cash_balance import CashBalance
@@ -54,7 +51,6 @@
 from stripe.api_resources.invoice import Invoice
 from stripe.api_resources.invoice_item import InvoiceItem
 from stripe.api_resources.invoice_line_item import InvoiceLineItem
-from stripe.api_resources.issuer_fraud_record import IssuerFraudRecord
 from stripe.api_resources.line_item import LineItem
 from stripe.api_resources.login_link import LoginLink
 from stripe.api_resources.mandate import Mandate
@@ -69,8 +65,6 @@
 from stripe.api_resources.product import Product
 from stripe.api_resources.promotion_code import PromotionCode
 from stripe.api_resources.quote import Quote
-from stripe.api_resources.recipient import Recipient
-from stripe.api_resources.recipient_transfer import RecipientTransfer
 from stripe.api_resources.refund import Refund
 from stripe.api_resources.reversal import Reversal
 from stripe.api_resources.review import Review
@@ -86,7 +80,6 @@
 from stripe.api_resources.tax_code import TaxCode
 from stripe.api_resources.tax_id import TaxId
 from stripe.api_resources.tax_rate import TaxRate
-from stripe.api_resources.three_d_secure import ThreeDSecure
 from stripe.api_resources.token import Token
 from stripe.api_resources.topup import Topup
 from stripe.api_resources.transfer import Transfer

stripe/api_resources/abstract/api_resource.py

@@ -13,8 +13,7 @@ def retrieve(cls, id, api_key=None, **params):
         return instance
 
     def refresh(self):
-        self.refresh_from(self.request("get", self.instance_url()))
-        return self
+        return self._request_and_refresh("get", self.instance_url())
 
     @classmethod
     def class_url(cls):
@@ -44,6 +43,65 @@ def instance_url(self):
         extn = quote_plus(id)
         return "%s/%s" % (base, extn)
 
+    # The `method_` and `url_` arguments are suffixed with an underscore to
+    # avoid conflicting with actual request parameters in `params`.
+    def _request(
+        self,
+        method_,
+        url_,
+        api_key=None,
+        idempotency_key=None,
+        stripe_version=None,
+        stripe_account=None,
+        headers=None,
+        params=None,
+    ):
+        obj = StripeObject._request(
+            self,
+            method_,
+            url_,
+            api_key,
+            idempotency_key,
+            stripe_version,
+            stripe_account,
+            headers,
+            params,
+        )
+
+        if type(self) is type(obj):
+            self.refresh_from(obj)
+            return self
+        else:
+            return obj
+
+    # The `method_` and `url_` arguments are suffixed with an underscore to
+    # avoid conflicting with actual request parameters in `params`.
+    def _request_and_refresh(
+        self,
+        method_,
+        url_,
+        api_key=None,
+        idempotency_key=None,
+        stripe_version=None,
+        stripe_account=None,
+        headers=None,
+        params=None,
+    ):
+        obj = StripeObject._request(
+            self,
+            method_,
+            url_,
+            api_key,
+            idempotency_key,
+            stripe_version,
+            stripe_account,
+            headers,
+            params,
+        )
+
+        self.refresh_from(obj)
+        return self
+
     # The `method_` and `url_` arguments are suffixed with an underscore to
     # avoid conflicting with actual request parameters in `params`.
     @classmethod
@@ -55,15 +113,15 @@ def _static_request(
         idempotency_key=None,
         stripe_version=None,
         stripe_account=None,
-        **params
+        params=None,
     ):
         requestor = api_requestor.APIRequestor(
             api_key, api_version=stripe_version, account=stripe_account
         )
         headers = util.populate_headers(idempotency_key)
         response, api_key = requestor.request(method_, url_, params, headers)
         return util.convert_to_stripe_object(
-            response, api_key, stripe_version, stripe_account
+            response, api_key, stripe_version, stripe_account, params
         )
 
     # The `method_` and `url_` arguments are suffixed with an underscore to
@@ -77,7 +135,7 @@ def _static_request_stream(
         idempotency_key=None,
         stripe_version=None,
         stripe_account=None,
-        **params
+        params=None,
     ):
         requestor = api_requestor.APIRequestor(
             api_key, api_version=stripe_version, account=stripe_account

stripe/api_resources/abstract/createable_api_resource.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe.api_resources.abstract.api_resource import APIResource
-from stripe import api_requestor, util
 
 
 class CreateableAPIResource(APIResource):
@@ -14,13 +13,12 @@ def create(
         stripe_account=None,
         **params
     ):
-        requestor = api_requestor.APIRequestor(
-            api_key, api_version=stripe_version, account=stripe_account
-        )
-        url = cls.class_url()
-        headers = util.populate_headers(idempotency_key)
-        response, api_key = requestor.request("post", url, params, headers)
-
-        return util.convert_to_stripe_object(
-            response, api_key, stripe_version, stripe_account
+        return cls._static_request(
+            "post",
+            cls.class_url(),
+            api_key,
+            idempotency_key,
+            stripe_version,
+            stripe_account,
+            params,
         )

stripe/api_resources/abstract/custom_method.py

@@ -20,7 +20,7 @@ def custom_method_request(cls, sid, **params):
                 quote_plus(util.utf8(sid)),
                 http_path,
             )
-            obj = cls._static_request(http_verb, url, **params)
+            obj = cls._static_request(http_verb, url, params=params)
 
             # For list objects, we have to attach the parameters so that they
             # can be referenced in auto-pagination and ensure consistency.
@@ -35,7 +35,7 @@ def custom_method_request_stream(cls, sid, **params):
                 quote_plus(util.utf8(sid)),
                 http_path,
             )
-            return cls._static_request_stream(http_verb, url, **params)
+            return cls._static_request_stream(http_verb, url, params=params)
 
         if is_streaming:
             class_method_impl = classmethod(custom_method_request_stream)

stripe/api_resources/abstract/deletable_api_resource.py

@@ -9,9 +9,10 @@ class DeletableAPIResource(APIResource):
     @classmethod
     def _cls_delete(cls, sid, **params):
         url = "%s/%s" % (cls.class_url(), quote_plus(util.utf8(sid)))
-        return cls._static_request("delete", url, **params)
+        return cls._static_request("delete", url, params=params)
 
     @util.class_method_variant("_cls_delete")
     def delete(self, **params):
-        self.refresh_from(self.request("delete", self.instance_url(), params))
-        return self
+        return self._request_and_refresh(
+            "delete", self.instance_url(), params=params
+        )

stripe/api_resources/abstract/listable_api_resource.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
 from stripe.api_resources.abstract.api_resource import APIResource
 
 
@@ -13,16 +12,11 @@ def auto_paging_iter(cls, *args, **params):
     def list(
         cls, api_key=None, stripe_version=None, stripe_account=None, **params
     ):
-        requestor = api_requestor.APIRequestor(
-            api_key,
-            api_base=cls.api_base(),
-            api_version=stripe_version,
-            account=stripe_account,
+        return cls._static_request(
+            "get",
+            cls.class_url(),
+            api_key=api_key,
+            stripe_version=stripe_version,
+            stripe_account=stripe_account,
+            params=params,
         )
-        url = cls.class_url()
-        response, api_key = requestor.request("get", url, params)
-        stripe_object = util.convert_to_stripe_object(
-            response, api_key, stripe_version, stripe_account
-        )
-        stripe_object._retrieve_params = params
-        return stripe_object

stripe/api_resources/abstract/nested_resource_class_methods.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
 from stripe.six.moves.urllib.parse import quote_plus
 
+from stripe.api_resources.abstract import APIResource
+
 
 def nested_resource_class_methods(
     resource, path=None, operations=None, resource_plural=None
@@ -38,13 +39,14 @@ def nested_resource_request(
             stripe_account=None,
             **params
         ):
-            requestor = api_requestor.APIRequestor(
-                api_key, api_version=stripe_version, account=stripe_account
-            )
-            headers = util.populate_headers(idempotency_key)
-            response, api_key = requestor.request(method, url, params, headers)
-            return util.convert_to_stripe_object(
-                response, api_key, stripe_version, stripe_account
+            return APIResource._static_request(
+                method,
+                url,
+                api_key=api_key,
+                idempotency_key=idempotency_key,
+                stripe_version=stripe_version,
+                stripe_account=stripe_account,
+                params=params,
             )
 
         resource_request_method = "%ss_request" % resource

stripe/api_resources/abstract/searchable_api_resource.py

@@ -1,6 +1,5 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
 from stripe.api_resources.abstract.api_resource import APIResource
 
 
@@ -14,15 +13,11 @@ def _search(
         stripe_account=None,
         **params
     ):
-        requestor = api_requestor.APIRequestor(
-            api_key,
-            api_base=cls.api_base(),
-            api_version=stripe_version,
-            account=stripe_account,
+        return cls._static_request(
+            "get",
+            search_url,
+            api_key=api_key,
+            stripe_version=stripe_version,
+            stripe_account=stripe_account,
+            params=params,
         )
-        response, api_key = requestor.request("get", search_url, params)
-        stripe_object = util.convert_to_stripe_object(
-            response, api_key, stripe_version, stripe_account
-        )
-        stripe_object._retrieve_params = params
-        return stripe_object

stripe/api_resources/abstract/updateable_api_resource.py

@@ -9,17 +9,16 @@ class UpdateableAPIResource(APIResource):
     @classmethod
     def modify(cls, sid, **params):
         url = "%s/%s" % (cls.class_url(), quote_plus(util.utf8(sid)))
-        return cls._static_request("post", url, **params)
+        return cls._static_request("post", url, params=params)
 
     def save(self, idempotency_key=None):
         updated_params = self.serialize(None)
-        headers = util.populate_headers(idempotency_key)
-
         if updated_params:
-            self.refresh_from(
-                self.request(
-                    "post", self.instance_url(), updated_params, headers
-                )
+            self._request_and_refresh(
+                "post",
+                self.instance_url(),
+                idempotency_key=idempotency_key,
+                params=updated_params,
             )
         else:
             util.logger.debug("Trying to save already saved object %r", self)

stripe/api_resources/abstract/verify_mixin.py

@@ -1,11 +1,9 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import util
-
 
 class VerifyMixin(object):
     def verify(self, idempotency_key=None, **params):
         url = self.instance_url() + "/verify"
-        headers = util.populate_headers(idempotency_key)
-        self.refresh_from(self.request("post", url, params, headers))
-        return self
+        return self._request(
+            "post", url, idempotency_key=idempotency_key, params=params
+        )