Skip to content
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.

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

Unify request sending and result parsing logic #832

1 change: 0 additions & 1 deletion stripe/api_resources/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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
Expand Down
4 changes: 4 additions & 0 deletions stripe/api_resources/abstract/api_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ 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_,
Expand Down Expand Up @@ -72,6 +74,8 @@ def _request(
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_,
Expand Down
8 changes: 0 additions & 8 deletions stripe/api_resources/issuer_fraud_record.py

This file was deleted.

32 changes: 0 additions & 32 deletions stripe/api_resources/transfer.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# File generated from our OpenAPI spec
from __future__ import absolute_import, division, print_function

from stripe import util
from stripe.api_resources.abstract import CreateableAPIResource
from stripe.api_resources.abstract import ListableAPIResource
from stripe.api_resources.abstract import UpdateableAPIResource
Expand All @@ -18,34 +17,3 @@ class Transfer(
UpdateableAPIResource,
):
OBJECT_NAME = "transfer"

@classmethod
def _cls_cancel(
pakrym-stripe marked this conversation as resolved.
Show resolved Hide resolved
cls,
transfer,
api_key=None,
stripe_version=None,
stripe_account=None,
**params
):
return cls._static_request(
"post",
"/v1/transfers/{transfer}/cancel".format(
transfer=util.sanitize_id(transfer)
),
api_key=api_key,
stripe_version=stripe_version,
stripe_account=stripe_account,
params=params,
)

@util.class_method_variant("_cls_cancel")
def cancel(self, idempotency_key=None, **params):
return self._request(
"post",
"/v1/transfers/{transfer}/cancel".format(
transfer=util.sanitize_id(self.get("id"))
),
idempotency_key=idempotency_key,
params=params,
)
1 change: 0 additions & 1 deletion stripe/object_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
api_resources.Invoice.OBJECT_NAME: api_resources.Invoice,
api_resources.InvoiceItem.OBJECT_NAME: api_resources.InvoiceItem,
api_resources.InvoiceLineItem.OBJECT_NAME: api_resources.InvoiceLineItem,
api_resources.IssuerFraudRecord.OBJECT_NAME: api_resources.IssuerFraudRecord,
api_resources.issuing.Authorization.OBJECT_NAME: api_resources.issuing.Authorization,
api_resources.issuing.Card.OBJECT_NAME: api_resources.issuing.Card,
api_resources.issuing.CardDetails.OBJECT_NAME: api_resources.issuing.CardDetails,
Expand Down
2 changes: 2 additions & 0 deletions stripe/stripe_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ def request(self, method, url, params=None, headers=None):
self, method, url, headers=headers, params=params
)

# The `method_` and `url_` arguments are suffixed with an underscore to
# avoid conflicting with actual request parameters in `params`.
def _request(
self,
method_,
Expand Down