From 7c12a0750bb6ce2260380f1383556dd91be4bab4 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 15:19:26 -0500 Subject: [PATCH 1/6] Codegen for openapi 403fdb8 --- stripe/api_resources/account.py | 3 ++- stripe/api_resources/apple_pay_domain.py | 4 +++- stripe/api_resources/application_fee.py | 3 ++- stripe/api_resources/billing_portal/__init__.py | 1 + .../api_resources/billing_portal/configuration.py | 13 +++++++++++++ stripe/api_resources/credit_note.py | 4 +++- stripe/api_resources/customer.py | 9 ++++++--- stripe/api_resources/file_link.py | 4 +++- stripe/api_resources/issuing/cardholder.py | 4 +++- stripe/api_resources/issuing/dispute.py | 4 +++- stripe/api_resources/payment_intent.py | 4 +++- stripe/api_resources/payment_method.py | 4 +++- stripe/api_resources/promotion_code.py | 4 +++- stripe/api_resources/radar/value_list_item.py | 4 +++- stripe/api_resources/setup_intent.py | 4 +++- stripe/api_resources/subscription_schedule.py | 4 +++- stripe/api_resources/tax_rate.py | 4 +++- stripe/api_resources/transfer.py | 7 +++++-- stripe/object_classes.py | 1 + 19 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 stripe/api_resources/billing_portal/configuration.py diff --git a/stripe/api_resources/account.py b/stripe/api_resources/account.py index 2bfd1b466..b235dd4d0 100644 --- a/stripe/api_resources/account.py +++ b/stripe/api_resources/account.py @@ -24,7 +24,8 @@ ) @nested_resource_class_methods("login_link", operations=["create"]) @nested_resource_class_methods( - "person", operations=["create", "retrieve", "update", "delete", "list"] + "person", + operations=["create", "retrieve", "update", "delete", "list"], ) class Account( CreateableAPIResource, diff --git a/stripe/api_resources/apple_pay_domain.py b/stripe/api_resources/apple_pay_domain.py index 94f51b36c..0e03d72af 100644 --- a/stripe/api_resources/apple_pay_domain.py +++ b/stripe/api_resources/apple_pay_domain.py @@ -6,7 +6,9 @@ class ApplePayDomain( - CreateableAPIResource, DeletableAPIResource, ListableAPIResource + CreateableAPIResource, + DeletableAPIResource, + ListableAPIResource, ): OBJECT_NAME = "apple_pay_domain" diff --git a/stripe/api_resources/application_fee.py b/stripe/api_resources/application_fee.py index e577398d5..3523e590c 100644 --- a/stripe/api_resources/application_fee.py +++ b/stripe/api_resources/application_fee.py @@ -6,7 +6,8 @@ @nested_resource_class_methods( - "refund", operations=["create", "retrieve", "update", "list"] + "refund", + operations=["create", "retrieve", "update", "list"], ) class ApplicationFee(ListableAPIResource): OBJECT_NAME = "application_fee" diff --git a/stripe/api_resources/billing_portal/__init__.py b/stripe/api_resources/billing_portal/__init__.py index e37703f2f..b366da1e9 100644 --- a/stripe/api_resources/billing_portal/__init__.py +++ b/stripe/api_resources/billing_portal/__init__.py @@ -2,4 +2,5 @@ # flake8: noqa +from stripe.api_resources.billing_portal.configuration import Configuration from stripe.api_resources.billing_portal.session import Session diff --git a/stripe/api_resources/billing_portal/configuration.py b/stripe/api_resources/billing_portal/configuration.py new file mode 100644 index 000000000..8be723650 --- /dev/null +++ b/stripe/api_resources/billing_portal/configuration.py @@ -0,0 +1,13 @@ +from __future__ import absolute_import, division, print_function + +from stripe.api_resources.abstract import CreateableAPIResource +from stripe.api_resources.abstract import ListableAPIResource +from stripe.api_resources.abstract import UpdateableAPIResource + + +class Configuration( + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, +): + OBJECT_NAME = "billing_portal.configuration" diff --git a/stripe/api_resources/credit_note.py b/stripe/api_resources/credit_note.py index ba3f5f5b6..f254b1f6f 100644 --- a/stripe/api_resources/credit_note.py +++ b/stripe/api_resources/credit_note.py @@ -10,7 +10,9 @@ @custom_method("void_credit_note", http_verb="post", http_path="void") class CreditNote( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "credit_note" diff --git a/stripe/api_resources/customer.py b/stripe/api_resources/customer.py index 991fe16fb..d7a6a0c9c 100644 --- a/stripe/api_resources/customer.py +++ b/stripe/api_resources/customer.py @@ -11,13 +11,16 @@ @custom_method("delete_discount", http_verb="delete", http_path="discount") @nested_resource_class_methods( - "balance_transaction", operations=["create", "retrieve", "update", "list"] + "balance_transaction", + operations=["create", "retrieve", "update", "list"], ) @nested_resource_class_methods( - "source", operations=["create", "retrieve", "update", "delete", "list"] + "source", + operations=["create", "retrieve", "update", "delete", "list"], ) @nested_resource_class_methods( - "tax_id", operations=["create", "retrieve", "delete", "list"] + "tax_id", + operations=["create", "retrieve", "delete", "list"], ) class Customer( CreateableAPIResource, diff --git a/stripe/api_resources/file_link.py b/stripe/api_resources/file_link.py index 4276531a3..226c569c9 100644 --- a/stripe/api_resources/file_link.py +++ b/stripe/api_resources/file_link.py @@ -6,6 +6,8 @@ class FileLink( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "file_link" diff --git a/stripe/api_resources/issuing/cardholder.py b/stripe/api_resources/issuing/cardholder.py index 39c890be0..b0f0e11a5 100644 --- a/stripe/api_resources/issuing/cardholder.py +++ b/stripe/api_resources/issuing/cardholder.py @@ -6,6 +6,8 @@ class Cardholder( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "issuing.cardholder" diff --git a/stripe/api_resources/issuing/dispute.py b/stripe/api_resources/issuing/dispute.py index 27c442a4c..51fd551ce 100644 --- a/stripe/api_resources/issuing/dispute.py +++ b/stripe/api_resources/issuing/dispute.py @@ -9,7 +9,9 @@ @custom_method("submit", http_verb="post") class Dispute( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "issuing.dispute" diff --git a/stripe/api_resources/payment_intent.py b/stripe/api_resources/payment_intent.py index a44325d20..5f560fdb7 100644 --- a/stripe/api_resources/payment_intent.py +++ b/stripe/api_resources/payment_intent.py @@ -11,7 +11,9 @@ @custom_method("capture", http_verb="post") @custom_method("confirm", http_verb="post") class PaymentIntent( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "payment_intent" diff --git a/stripe/api_resources/payment_method.py b/stripe/api_resources/payment_method.py index 87fc62ce5..5acfa3bb6 100644 --- a/stripe/api_resources/payment_method.py +++ b/stripe/api_resources/payment_method.py @@ -10,7 +10,9 @@ @custom_method("attach", http_verb="post") @custom_method("detach", http_verb="post") class PaymentMethod( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "payment_method" diff --git a/stripe/api_resources/promotion_code.py b/stripe/api_resources/promotion_code.py index 5db6e749b..d288f29c1 100644 --- a/stripe/api_resources/promotion_code.py +++ b/stripe/api_resources/promotion_code.py @@ -6,6 +6,8 @@ class PromotionCode( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "promotion_code" diff --git a/stripe/api_resources/radar/value_list_item.py b/stripe/api_resources/radar/value_list_item.py index 942634636..4d15fce59 100644 --- a/stripe/api_resources/radar/value_list_item.py +++ b/stripe/api_resources/radar/value_list_item.py @@ -6,6 +6,8 @@ class ValueListItem( - CreateableAPIResource, DeletableAPIResource, ListableAPIResource + CreateableAPIResource, + DeletableAPIResource, + ListableAPIResource, ): OBJECT_NAME = "radar.value_list_item" diff --git a/stripe/api_resources/setup_intent.py b/stripe/api_resources/setup_intent.py index bace247c8..71ad9fa7f 100644 --- a/stripe/api_resources/setup_intent.py +++ b/stripe/api_resources/setup_intent.py @@ -10,7 +10,9 @@ @custom_method("cancel", http_verb="post") @custom_method("confirm", http_verb="post") class SetupIntent( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "setup_intent" diff --git a/stripe/api_resources/subscription_schedule.py b/stripe/api_resources/subscription_schedule.py index f072df9ba..b42be4f9a 100644 --- a/stripe/api_resources/subscription_schedule.py +++ b/stripe/api_resources/subscription_schedule.py @@ -10,7 +10,9 @@ @custom_method("cancel", http_verb="post") @custom_method("release", http_verb="post") class SubscriptionSchedule( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "subscription_schedule" diff --git a/stripe/api_resources/tax_rate.py b/stripe/api_resources/tax_rate.py index 16c5da1c0..cd44254dc 100644 --- a/stripe/api_resources/tax_rate.py +++ b/stripe/api_resources/tax_rate.py @@ -6,6 +6,8 @@ class TaxRate( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "tax_rate" diff --git a/stripe/api_resources/transfer.py b/stripe/api_resources/transfer.py index 0d99a4714..3d727fc88 100644 --- a/stripe/api_resources/transfer.py +++ b/stripe/api_resources/transfer.py @@ -10,10 +10,13 @@ @custom_method("cancel", http_verb="post") @nested_resource_class_methods( - "reversal", operations=["create", "retrieve", "update", "list"] + "reversal", + operations=["create", "retrieve", "update", "list"], ) class Transfer( - CreateableAPIResource, ListableAPIResource, UpdateableAPIResource + CreateableAPIResource, + ListableAPIResource, + UpdateableAPIResource, ): OBJECT_NAME = "transfer" diff --git a/stripe/object_classes.py b/stripe/object_classes.py index a253665f5..236710dd8 100644 --- a/stripe/object_classes.py +++ b/stripe/object_classes.py @@ -16,6 +16,7 @@ api_resources.Balance.OBJECT_NAME: api_resources.Balance, api_resources.BalanceTransaction.OBJECT_NAME: api_resources.BalanceTransaction, api_resources.BankAccount.OBJECT_NAME: api_resources.BankAccount, + api_resources.billing_portal.Configuration.OBJECT_NAME: api_resources.billing_portal.Configuration, api_resources.billing_portal.Session.OBJECT_NAME: api_resources.billing_portal.Session, api_resources.BitcoinReceiver.OBJECT_NAME: api_resources.BitcoinReceiver, api_resources.BitcoinTransaction.OBJECT_NAME: api_resources.BitcoinTransaction, From e29f314962471c2fcf85d5365b37a03862d89eb4 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 15:31:51 -0500 Subject: [PATCH 2/6] Add test --- .travis.yml | 2 +- .../billing_portal/test_configuration.py | 51 +++++++++++++++++++ tests/conftest.py | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 tests/api_resources/billing_portal/test_configuration.py diff --git a/.travis.yml b/.travis.yml index fcb86b53b..d5f2fbad0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ cache: env: global: # If changing this number, please also change it in `tests/conftest.py`. - - STRIPE_MOCK_VERSION=0.101.0 + - STRIPE_MOCK_VERSION=0.102.0 before_install: # Unpack and start stripe-mock so that the test suite can talk to it diff --git a/tests/api_resources/billing_portal/test_configuration.py b/tests/api_resources/billing_portal/test_configuration.py new file mode 100644 index 000000000..dffa3208e --- /dev/null +++ b/tests/api_resources/billing_portal/test_configuration.py @@ -0,0 +1,51 @@ +from __future__ import absolute_import, division, print_function + +import stripe + + +TEST_RESOURCE_ID = "bpc_123" + + +class TestConfiguration(object): + def test_is_creatable(self, request_mock): + resource = stripe.billing_portal.Configuration.create( + business_profile={ + "privacy_policy_url": "https://example.com/privacy", + "terms_of_service_url": "https://example.com/tos", + }, + features={ + "customer_update": { + "allowed_updates": ["address"], + "enabled": True, + } + }, + ) + request_mock.assert_requested( + "post", "/v1/billing_portal/configurations" + ) + assert isinstance(resource, stripe.billing_portal.Configuration) + + def test_is_retrievable(self, request_mock): + resource = stripe.billing_portal.Configuration.retrieve( + TEST_RESOURCE_ID + ) + request_mock.assert_requested( + "get", "/v1/billing_portal/configurations/%s" % (TEST_RESOURCE_ID) + ) + assert isinstance(resource, stripe.billing_portal.Configuration) + + def test_is_modifiable(self, request_mock): + resource = stripe.billing_portal.Configuration.modify(TEST_RESOURCE_ID) + request_mock.assert_requested( + "post", "/v1/billing_portal/configurations/%s" % (TEST_RESOURCE_ID) + ) + assert isinstance(resource, stripe.billing_portal.Configuration) + + def test_is_listable(self, request_mock): + resource = stripe.billing_portal.Configuration.list() + request_mock.assert_requested( + "get", "/v1/billing_portal/configurations" + ) + assert isinstance( + resource.data[0], stripe.billing_portal.Configuration + ) diff --git a/tests/conftest.py b/tests/conftest.py index 391b7dabe..0601ff6e5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,7 +16,7 @@ # When changing this number, don't forget to change it in `.travis.yml` too. -MOCK_MINIMUM_VERSION = "0.101.0" +MOCK_MINIMUM_VERSION = "0.102.0" # Starts stripe-mock if an OpenAPI spec override is found in `openapi/`, and # otherwise fall back to `STRIPE_MOCK_PORT` or 12111. From 56887c37893bc6c7054198e135876b8bd6088df9 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 15:37:44 -0500 Subject: [PATCH 3/6] Bump mock again --- .travis.yml | 2 +- tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5f2fbad0..7a489001e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ cache: env: global: # If changing this number, please also change it in `tests/conftest.py`. - - STRIPE_MOCK_VERSION=0.102.0 + - STRIPE_MOCK_VERSION=0.103.0 before_install: # Unpack and start stripe-mock so that the test suite can talk to it diff --git a/tests/conftest.py b/tests/conftest.py index 0601ff6e5..e4a8188f9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -16,7 +16,7 @@ # When changing this number, don't forget to change it in `.travis.yml` too. -MOCK_MINIMUM_VERSION = "0.102.0" +MOCK_MINIMUM_VERSION = "0.103.0" # Starts stripe-mock if an OpenAPI spec override is found in `openapi/`, and # otherwise fall back to `STRIPE_MOCK_PORT` or 12111. From b32a0aee264313cc481fa25eeabf97c881e69a0a Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 19:17:27 -0500 Subject: [PATCH 4/6] Revert "Bump Black to latest version (#712)" This reverts commit 418b67b9e179e8085fa56bc20ee21e5fac35e01f. --- stripe/api_resources/source.py | 3 ++- stripe/api_resources/subscription_item.py | 3 ++- stripe/oauth_error.py | 6 ++---- tests/test_integration.py | 6 ++---- tox.ini | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/stripe/api_resources/source.py b/stripe/api_resources/source.py index 074062202..db910d796 100644 --- a/stripe/api_resources/source.py +++ b/stripe/api_resources/source.py @@ -36,7 +36,8 @@ def detach(self, idempotency_key=None, **params): ) def source_transactions(self, **params): - """source_transactions is deprecated, use Source.list_source_transactions instead.""" + """source_transactions is deprecated, use Source.list_source_transactions instead. + """ return self.request( "get", self.instance_url() + "/source_transactions", params ) diff --git a/stripe/api_resources/subscription_item.py b/stripe/api_resources/subscription_item.py index e601b8523..748d39c13 100644 --- a/stripe/api_resources/subscription_item.py +++ b/stripe/api_resources/subscription_item.py @@ -22,7 +22,8 @@ class SubscriptionItem( OBJECT_NAME = "subscription_item" def usage_record_summaries(self, **params): - """usage_record_summaries is deprecated, use SubscriptionItem.list_usage_record_summaries instead.""" + """usage_record_summaries is deprecated, use SubscriptionItem.list_usage_record_summaries instead. + """ return self.request( "get", self.instance_url() + "/usage_record_summaries", params ) diff --git a/stripe/oauth_error.py b/stripe/oauth_error.py index 35f658700..b755b05cf 100644 --- a/stripe/oauth_error.py +++ b/stripe/oauth_error.py @@ -22,10 +22,8 @@ def construct_error_object(self): if self.json_body is None: return None - return ( - stripe.api_resources.error_object.OAuthErrorObject.construct_from( - self.json_body, stripe.api_key - ) + return stripe.api_resources.error_object.OAuthErrorObject.construct_from( + self.json_body, stripe.api_key ) diff --git a/tests/test_integration.py b/tests/test_integration.py index fe3b64721..fe8c1a679 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -134,10 +134,8 @@ def do_GET(self): self.setup_mock_server(MockServerRequestHandler) - stripe.default_http_client = ( - stripe.http_client.new_default_http_client( - proxy="http://localhost:%s" % self.mock_server_port - ) + stripe.default_http_client = stripe.http_client.new_default_http_client( + proxy="http://localhost:%s" % self.mock_server_port ) stripe.Balance.retrieve() assert MockServerRequestHandler.num_requests == 1 diff --git a/tox.ini b/tox.ini index bd1f21fa0..722771e21 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,7 @@ passenv = LDFLAGS CFLAGS [testenv:fmt] description = run code formatting using black basepython = python3.9 -deps = black==20.8b1 +deps = black==19.3b0 commands = black . {posargs} skip_install = true From d9072470ce596f5d8e7fcedc58c035e562b4edc0 Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 19:18:05 -0500 Subject: [PATCH 5/6] Fixed formatting --- stripe/api_resources/account.py | 3 +-- stripe/api_resources/apple_pay_domain.py | 4 +--- stripe/api_resources/application_fee.py | 3 +-- stripe/api_resources/billing_portal/configuration.py | 4 +--- stripe/api_resources/credit_note.py | 4 +--- stripe/api_resources/customer.py | 9 +++------ stripe/api_resources/file_link.py | 4 +--- stripe/api_resources/issuing/cardholder.py | 4 +--- stripe/api_resources/issuing/dispute.py | 4 +--- stripe/api_resources/payment_intent.py | 4 +--- stripe/api_resources/payment_method.py | 4 +--- stripe/api_resources/promotion_code.py | 4 +--- stripe/api_resources/radar/value_list_item.py | 4 +--- stripe/api_resources/setup_intent.py | 4 +--- stripe/api_resources/subscription_schedule.py | 4 +--- stripe/api_resources/tax_rate.py | 4 +--- stripe/api_resources/transfer.py | 7 ++----- 17 files changed, 20 insertions(+), 54 deletions(-) diff --git a/stripe/api_resources/account.py b/stripe/api_resources/account.py index b235dd4d0..2bfd1b466 100644 --- a/stripe/api_resources/account.py +++ b/stripe/api_resources/account.py @@ -24,8 +24,7 @@ ) @nested_resource_class_methods("login_link", operations=["create"]) @nested_resource_class_methods( - "person", - operations=["create", "retrieve", "update", "delete", "list"], + "person", operations=["create", "retrieve", "update", "delete", "list"] ) class Account( CreateableAPIResource, diff --git a/stripe/api_resources/apple_pay_domain.py b/stripe/api_resources/apple_pay_domain.py index 0e03d72af..94f51b36c 100644 --- a/stripe/api_resources/apple_pay_domain.py +++ b/stripe/api_resources/apple_pay_domain.py @@ -6,9 +6,7 @@ class ApplePayDomain( - CreateableAPIResource, - DeletableAPIResource, - ListableAPIResource, + CreateableAPIResource, DeletableAPIResource, ListableAPIResource ): OBJECT_NAME = "apple_pay_domain" diff --git a/stripe/api_resources/application_fee.py b/stripe/api_resources/application_fee.py index 3523e590c..e577398d5 100644 --- a/stripe/api_resources/application_fee.py +++ b/stripe/api_resources/application_fee.py @@ -6,8 +6,7 @@ @nested_resource_class_methods( - "refund", - operations=["create", "retrieve", "update", "list"], + "refund", operations=["create", "retrieve", "update", "list"] ) class ApplicationFee(ListableAPIResource): OBJECT_NAME = "application_fee" diff --git a/stripe/api_resources/billing_portal/configuration.py b/stripe/api_resources/billing_portal/configuration.py index 8be723650..6d8969560 100644 --- a/stripe/api_resources/billing_portal/configuration.py +++ b/stripe/api_resources/billing_portal/configuration.py @@ -6,8 +6,6 @@ class Configuration( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "billing_portal.configuration" diff --git a/stripe/api_resources/credit_note.py b/stripe/api_resources/credit_note.py index f254b1f6f..ba3f5f5b6 100644 --- a/stripe/api_resources/credit_note.py +++ b/stripe/api_resources/credit_note.py @@ -10,9 +10,7 @@ @custom_method("void_credit_note", http_verb="post", http_path="void") class CreditNote( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "credit_note" diff --git a/stripe/api_resources/customer.py b/stripe/api_resources/customer.py index d7a6a0c9c..991fe16fb 100644 --- a/stripe/api_resources/customer.py +++ b/stripe/api_resources/customer.py @@ -11,16 +11,13 @@ @custom_method("delete_discount", http_verb="delete", http_path="discount") @nested_resource_class_methods( - "balance_transaction", - operations=["create", "retrieve", "update", "list"], + "balance_transaction", operations=["create", "retrieve", "update", "list"] ) @nested_resource_class_methods( - "source", - operations=["create", "retrieve", "update", "delete", "list"], + "source", operations=["create", "retrieve", "update", "delete", "list"] ) @nested_resource_class_methods( - "tax_id", - operations=["create", "retrieve", "delete", "list"], + "tax_id", operations=["create", "retrieve", "delete", "list"] ) class Customer( CreateableAPIResource, diff --git a/stripe/api_resources/file_link.py b/stripe/api_resources/file_link.py index 226c569c9..4276531a3 100644 --- a/stripe/api_resources/file_link.py +++ b/stripe/api_resources/file_link.py @@ -6,8 +6,6 @@ class FileLink( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "file_link" diff --git a/stripe/api_resources/issuing/cardholder.py b/stripe/api_resources/issuing/cardholder.py index b0f0e11a5..39c890be0 100644 --- a/stripe/api_resources/issuing/cardholder.py +++ b/stripe/api_resources/issuing/cardholder.py @@ -6,8 +6,6 @@ class Cardholder( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "issuing.cardholder" diff --git a/stripe/api_resources/issuing/dispute.py b/stripe/api_resources/issuing/dispute.py index 51fd551ce..27c442a4c 100644 --- a/stripe/api_resources/issuing/dispute.py +++ b/stripe/api_resources/issuing/dispute.py @@ -9,9 +9,7 @@ @custom_method("submit", http_verb="post") class Dispute( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "issuing.dispute" diff --git a/stripe/api_resources/payment_intent.py b/stripe/api_resources/payment_intent.py index 5f560fdb7..a44325d20 100644 --- a/stripe/api_resources/payment_intent.py +++ b/stripe/api_resources/payment_intent.py @@ -11,9 +11,7 @@ @custom_method("capture", http_verb="post") @custom_method("confirm", http_verb="post") class PaymentIntent( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "payment_intent" diff --git a/stripe/api_resources/payment_method.py b/stripe/api_resources/payment_method.py index 5acfa3bb6..87fc62ce5 100644 --- a/stripe/api_resources/payment_method.py +++ b/stripe/api_resources/payment_method.py @@ -10,9 +10,7 @@ @custom_method("attach", http_verb="post") @custom_method("detach", http_verb="post") class PaymentMethod( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "payment_method" diff --git a/stripe/api_resources/promotion_code.py b/stripe/api_resources/promotion_code.py index d288f29c1..5db6e749b 100644 --- a/stripe/api_resources/promotion_code.py +++ b/stripe/api_resources/promotion_code.py @@ -6,8 +6,6 @@ class PromotionCode( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "promotion_code" diff --git a/stripe/api_resources/radar/value_list_item.py b/stripe/api_resources/radar/value_list_item.py index 4d15fce59..942634636 100644 --- a/stripe/api_resources/radar/value_list_item.py +++ b/stripe/api_resources/radar/value_list_item.py @@ -6,8 +6,6 @@ class ValueListItem( - CreateableAPIResource, - DeletableAPIResource, - ListableAPIResource, + CreateableAPIResource, DeletableAPIResource, ListableAPIResource ): OBJECT_NAME = "radar.value_list_item" diff --git a/stripe/api_resources/setup_intent.py b/stripe/api_resources/setup_intent.py index 71ad9fa7f..bace247c8 100644 --- a/stripe/api_resources/setup_intent.py +++ b/stripe/api_resources/setup_intent.py @@ -10,9 +10,7 @@ @custom_method("cancel", http_verb="post") @custom_method("confirm", http_verb="post") class SetupIntent( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "setup_intent" diff --git a/stripe/api_resources/subscription_schedule.py b/stripe/api_resources/subscription_schedule.py index b42be4f9a..f072df9ba 100644 --- a/stripe/api_resources/subscription_schedule.py +++ b/stripe/api_resources/subscription_schedule.py @@ -10,9 +10,7 @@ @custom_method("cancel", http_verb="post") @custom_method("release", http_verb="post") class SubscriptionSchedule( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "subscription_schedule" diff --git a/stripe/api_resources/tax_rate.py b/stripe/api_resources/tax_rate.py index cd44254dc..16c5da1c0 100644 --- a/stripe/api_resources/tax_rate.py +++ b/stripe/api_resources/tax_rate.py @@ -6,8 +6,6 @@ class TaxRate( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "tax_rate" diff --git a/stripe/api_resources/transfer.py b/stripe/api_resources/transfer.py index 3d727fc88..0d99a4714 100644 --- a/stripe/api_resources/transfer.py +++ b/stripe/api_resources/transfer.py @@ -10,13 +10,10 @@ @custom_method("cancel", http_verb="post") @nested_resource_class_methods( - "reversal", - operations=["create", "retrieve", "update", "list"], + "reversal", operations=["create", "retrieve", "update", "list"] ) class Transfer( - CreateableAPIResource, - ListableAPIResource, - UpdateableAPIResource, + CreateableAPIResource, ListableAPIResource, UpdateableAPIResource ): OBJECT_NAME = "transfer" From a0a83eda89185f2b228f7b2619db33b691e73bdf Mon Sep 17 00:00:00 2001 From: Richard Marmorstein Date: Fri, 19 Feb 2021 19:17:49 -0500 Subject: [PATCH 6/6] Revert "Revert "Bump Black to latest version (#712)"" This reverts commit b32a0aee264313cc481fa25eeabf97c881e69a0a. --- stripe/api_resources/source.py | 3 +-- stripe/api_resources/subscription_item.py | 3 +-- stripe/oauth_error.py | 6 ++++-- tests/test_integration.py | 6 ++++-- tox.ini | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/stripe/api_resources/source.py b/stripe/api_resources/source.py index db910d796..074062202 100644 --- a/stripe/api_resources/source.py +++ b/stripe/api_resources/source.py @@ -36,8 +36,7 @@ def detach(self, idempotency_key=None, **params): ) def source_transactions(self, **params): - """source_transactions is deprecated, use Source.list_source_transactions instead. - """ + """source_transactions is deprecated, use Source.list_source_transactions instead.""" return self.request( "get", self.instance_url() + "/source_transactions", params ) diff --git a/stripe/api_resources/subscription_item.py b/stripe/api_resources/subscription_item.py index 748d39c13..e601b8523 100644 --- a/stripe/api_resources/subscription_item.py +++ b/stripe/api_resources/subscription_item.py @@ -22,8 +22,7 @@ class SubscriptionItem( OBJECT_NAME = "subscription_item" def usage_record_summaries(self, **params): - """usage_record_summaries is deprecated, use SubscriptionItem.list_usage_record_summaries instead. - """ + """usage_record_summaries is deprecated, use SubscriptionItem.list_usage_record_summaries instead.""" return self.request( "get", self.instance_url() + "/usage_record_summaries", params ) diff --git a/stripe/oauth_error.py b/stripe/oauth_error.py index b755b05cf..35f658700 100644 --- a/stripe/oauth_error.py +++ b/stripe/oauth_error.py @@ -22,8 +22,10 @@ def construct_error_object(self): if self.json_body is None: return None - return stripe.api_resources.error_object.OAuthErrorObject.construct_from( - self.json_body, stripe.api_key + return ( + stripe.api_resources.error_object.OAuthErrorObject.construct_from( + self.json_body, stripe.api_key + ) ) diff --git a/tests/test_integration.py b/tests/test_integration.py index fe8c1a679..fe3b64721 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -134,8 +134,10 @@ def do_GET(self): self.setup_mock_server(MockServerRequestHandler) - stripe.default_http_client = stripe.http_client.new_default_http_client( - proxy="http://localhost:%s" % self.mock_server_port + stripe.default_http_client = ( + stripe.http_client.new_default_http_client( + proxy="http://localhost:%s" % self.mock_server_port + ) ) stripe.Balance.retrieve() assert MockServerRequestHandler.num_requests == 1 diff --git a/tox.ini b/tox.ini index 722771e21..bd1f21fa0 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,7 @@ passenv = LDFLAGS CFLAGS [testenv:fmt] description = run code formatting using black basepython = python3.9 -deps = black==19.3b0 +deps = black==20.8b1 commands = black . {posargs} skip_install = true