Safe codegen formatting changes (stripe#573)

* Safe formatting changes from dmitry's branch

branch: dmitrykorolev/codegen
pr: stripe#565

* Split some imports for better uniq'ing

* Sort with basic case-sensitive algo

* Reorder nested resource imports

* Reorder a comment in a way that is more convenient

stripe/api_resources/account.py

@@ -1,13 +1,14 @@
 from __future__ import absolute_import, division, print_function
 
 import stripe
-from stripe import oauth, six, util
+from stripe import oauth, six
+from stripe import 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.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
+from stripe.api_resources.abstract import nested_resource_class_methods
 from stripe.six.moves.urllib.parse import quote_plus
 
 
@@ -27,12 +28,21 @@
 )
 class Account(
  CreateableAPIResource,
+ DeletableAPIResource,
  ListableAPIResource,
  UpdateableAPIResource,
- DeletableAPIResource,
 ):
  OBJECT_NAME = "account"
 
+ def reject(self, idempotency_key=None, **params):
+ url = self.instance_url() + "/reject"
+ headers = util.populate_headers(idempotency_key)
+ self.refresh_from(self.request("post", url, params, headers))
+ return self
+
+ # We are not adding a helper for capabilities here as the Account object already has a
+ # capabilities property which is a hash and not the sub-list of capabilities.
+
  @classmethod
  def retrieve(cls, id=None, api_key=None, **params):
  instance = cls(id, api_key, **params)
@@ -59,15 +69,6 @@ def instance_url(self):
  def persons(self, **params):
  return self.request("get", self.instance_url() + "/persons", params)
 
- # We are not adding a helper for capabilities here as the Account object already has a
- # capabilities property which is a hash and not the sub-list of capabilities.
-
- def reject(self, idempotency_key=None, **params):
- url = self.instance_url() + "/reject"
- headers = util.populate_headers(idempotency_key)
- self.refresh_from(self.request("post", url, params, headers))
- return self
-
  def deauthorize(self, **params):
  params["stripe_user_id"] = self.id
  return oauth.OAuth.deauthorize(**params)

stripe/api_resources/alipay_account.py

@@ -1,14 +1,13 @@
 from __future__ import absolute_import, division, print_function
 
 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.api_resources.customer import Customer
 from stripe.six.moves.urllib.parse import quote_plus
 
 
-class AlipayAccount(UpdateableAPIResource, DeletableAPIResource):
+class AlipayAccount(DeletableAPIResource, UpdateableAPIResource):
  OBJECT_NAME = "alipay_account"
 
  @classmethod

stripe/api_resources/apple_pay_domain.py

@@ -6,7 +6,7 @@
 
 
 class ApplePayDomain(
- CreateableAPIResource, ListableAPIResource, DeletableAPIResource
+ CreateableAPIResource, DeletableAPIResource, ListableAPIResource
 ):
  OBJECT_NAME = "apple_pay_domain"
 

stripe/api_resources/application_fee_refund.py

@@ -3,7 +3,6 @@
 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
 
 

stripe/api_resources/bank_account.py

@@ -1,15 +1,16 @@
 from __future__ import absolute_import, division, print_function
 
-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 import error
+from stripe import util
 from stripe.api_resources.abstract import DeletableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import VerifyMixin
+from stripe.api_resources.account import Account
+from stripe.api_resources.customer import Customer
 from stripe.six.moves.urllib.parse import quote_plus
 
 
-class BankAccount(UpdateableAPIResource, DeletableAPIResource, VerifyMixin):
+class BankAccount(DeletableAPIResource, UpdateableAPIResource, VerifyMixin):
  OBJECT_NAME = "bank_account"
 
  def instance_url(self):

stripe/api_resources/bitcoin_receiver.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe import util
-from stripe.api_resources.customer import Customer
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.customer import Customer
 from stripe.six.moves.urllib.parse import quote_plus
 
 

stripe/api_resources/card.py

@@ -1,15 +1,16 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import error, util
+from stripe import error
+from stripe import util
+from stripe.api_resources.abstract import DeletableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 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):
+class Card(DeletableAPIResource, UpdateableAPIResource):
  OBJECT_NAME = "card"
 
  def instance_url(self):

stripe/api_resources/charge.py

@@ -1,9 +1,10 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
+from stripe import api_requestor
+from stripe import util
 from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 
 
@@ -13,14 +14,14 @@ class Charge(
 ):
  OBJECT_NAME = "charge"
 
- def refund(self, idempotency_key=None, **params):
- url = self.instance_url() + "/refund"
+ def capture(self, idempotency_key=None, **params):
+ url = self.instance_url() + "/capture"
  headers = util.populate_headers(idempotency_key)
  self.refresh_from(self.request("post", url, params, headers))
  return self
 
- def capture(self, idempotency_key=None, **params):
- url = self.instance_url() + "/capture"
+ def refund(self, idempotency_key=None, **params):
+ url = self.instance_url() + "/refund"
  headers = util.populate_headers(idempotency_key)
  self.refresh_from(self.request("post", url, params, headers))
  return self

stripe/api_resources/country_spec.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe.api_resources import abstract
+from stripe.api_resources.abstract import ListableAPIResource
 
 
-class CountrySpec(abstract.ListableAPIResource):
+class CountrySpec(ListableAPIResource):
  OBJECT_NAME = "country_spec"

stripe/api_resources/coupon.py

@@ -2,14 +2,14 @@
 
 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 UpdateableAPIResource
 
 
 class Coupon(
  CreateableAPIResource,
- UpdateableAPIResource,
  DeletableAPIResource,
  ListableAPIResource,
+ UpdateableAPIResource,
 ):
  OBJECT_NAME = "coupon"

stripe/api_resources/credit_note.py

@@ -2,14 +2,14 @@
 
 from stripe import util
 from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 
 
 @custom_method("void_credit_note", http_verb="post", http_path="void")
 class CreditNote(
- CreateableAPIResource, UpdateableAPIResource, ListableAPIResource
+ CreateableAPIResource, ListableAPIResource, UpdateableAPIResource
 ):
  OBJECT_NAME = "credit_note"
 

stripe/api_resources/customer.py

@@ -3,8 +3,8 @@
 from stripe import api_requestor
 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 UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 from stripe.api_resources.abstract import nested_resource_class_methods
 
@@ -18,9 +18,9 @@
 )
 class Customer(
  CreateableAPIResource,
- UpdateableAPIResource,
- ListableAPIResource,
  DeletableAPIResource,
+ ListableAPIResource,
+ UpdateableAPIResource,
 ):
  OBJECT_NAME = "customer"
 

stripe/api_resources/ephemeral_key.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
+from stripe import api_requestor
+from stripe import util
 from stripe.api_resources.abstract import DeletableAPIResource
 
 

stripe/api_resources/event.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe.api_resources import abstract
+from stripe.api_resources.abstract import ListableAPIResource
 
 
-class Event(abstract.ListableAPIResource):
+class Event(ListableAPIResource):
  OBJECT_NAME = "event"

stripe/api_resources/file.py

@@ -1,16 +1,18 @@
 from __future__ import absolute_import, division, print_function
 
 import stripe
-from stripe import api_requestor, util
+from stripe import api_requestor
+from stripe import util
 from stripe.api_resources.abstract import ListableAPIResource
 
 
 class File(ListableAPIResource):
+ OBJECT_NAME = "file"
+
  # This resource can have two different object names. In latter API
  # versions, only `file` is used, but since stripe-python may be used with
  # any API version, we need to support deserializing the older
  # `file_upload` object into the same class.
- OBJECT_NAME = "file"
  OBJECT_NAME_ALT = "file_upload"
 
  @classmethod

stripe/api_resources/file_link.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 
 
 class FileLink(

stripe/api_resources/invoice.py

@@ -1,10 +1,11 @@
 from __future__ import absolute_import, division, print_function
 
-from stripe import api_requestor, util
+from stripe import api_requestor
+from stripe import 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 UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 
 
@@ -15,9 +16,9 @@
 @custom_method("void_invoice", http_verb="post", http_path="void")
 class Invoice(
  CreateableAPIResource,
- UpdateableAPIResource,
  DeletableAPIResource,
  ListableAPIResource,
+ UpdateableAPIResource,
 ):
  OBJECT_NAME = "invoice"
 
@@ -45,6 +46,12 @@ def send_invoice(self, idempotency_key=None, **params):
  self.refresh_from(self.request("post", url, params, headers))
  return self
 
+ def void_invoice(self, idempotency_key=None, **params):
+ url = self.instance_url() + "/void"
+ headers = util.populate_headers(idempotency_key)
+ self.refresh_from(self.request("post", url, params, headers))
+ return self
+
  @classmethod
  def upcoming(
  cls, api_key=None, stripe_version=None, stripe_account=None, **params
@@ -57,9 +64,3 @@ def upcoming(
  return util.convert_to_stripe_object(
  response, api_key, stripe_version, stripe_account
  )
-
- def void_invoice(self, idempotency_key=None, **params):
- url = self.instance_url() + "/void"
- headers = util.populate_headers(idempotency_key)
- self.refresh_from(self.request("post", url, params, headers))
- return self

stripe/api_resources/invoice_item.py

@@ -2,14 +2,14 @@
 
 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 UpdateableAPIResource
 
 
 class InvoiceItem(
  CreateableAPIResource,
- UpdateableAPIResource,
- ListableAPIResource,
  DeletableAPIResource,
+ ListableAPIResource,
+ UpdateableAPIResource,
 ):
  OBJECT_NAME = "invoiceitem"

stripe/api_resources/issuer_fraud_record.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division, print_function
+
 from stripe.api_resources.abstract import ListableAPIResource
 
 

stripe/api_resources/issuing/authorization.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe import util
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 
 

stripe/api_resources/issuing/card.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import custom_method
 
 

stripe/api_resources/issuing/cardholder.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, division, print_function
 
 from stripe.api_resources.abstract import CreateableAPIResource
-from stripe.api_resources.abstract import UpdateableAPIResource
 from stripe.api_resources.abstract import ListableAPIResource
+from stripe.api_resources.abstract import UpdateableAPIResource
 
 
 class Cardholder(