Merge pull request #1766 from stripe/xavdid/merge-python-private-preview

Merge to private-preview

Author: xavdid-stripe

.github/workflows/ci.yml

@@ -88,16 +88,12 @@ jobs:
         python_version:
           # The last ~5 versions, once we're on schedule
           # https://docs.stripe.com/sdks/versioning?lang=python#stripe-sdk-language-version-support-policy
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
           - "3.14"
-          - "pypy-3.7"
-          - "pypy-3.8"
           - "pypy-3.9"
           - "pypy-3.10"
           - "pypy-3.11"
@@ -118,8 +114,7 @@ jobs:
     name: Publish
     if: >-
       ((github.event_name == 'workflow_dispatch') || (github.event_name == 'push')) &&
-      startsWith(github.ref, 'refs/tags/v') &&
-      endsWith(github.actor, '-stripe')
+      startsWith(github.ref, 'refs/tags/v')
     needs: [build, test, lint]
     runs-on: "ubuntu-24.04"
     permissions:

README.md

@@ -32,9 +32,9 @@ python -m pip install .
 
 ### Requirements
 
-Per our [Language Version Support Policy](https://docs.stripe.com/sdks/versioning?lang=python#stripe-sdk-language-version-support-policy), we currently support **Python 3.7+**.
+Per our [Language Version Support Policy](https://docs.stripe.com/sdks/versioning?lang=python#stripe-sdk-language-version-support-policy), we currently support **Python 3.9+**.
 
-Support for Python 3.7 and 3.8 is deprecated and will be removed in an upcoming major version. Read more and see the full schedule in the docs: https://docs.stripe.com/sdks/versioning?lang=python#stripe-sdk-language-version-support-policy
+Read more and see the full schedule in the docs: https://docs.stripe.com/sdks/versioning?lang=python#stripe-sdk-language-version-support-policy
 
 #### Extended Support
 

flake8_stripe/flake8_stripe.py

@@ -10,17 +10,12 @@ class TypingImportsChecker:
     version = "0.1.0"
 
     # Rules:
-    # * typing_extensions v4.1.1 is the latest that supports Python 3.6
-    # so don't depend on anything from a more recent version than that.
-    #
-    # If we need something newer, maybe we can provide it for users on
-    # newer versions with a conditional import, but we'll cross that
-    # bridge when we come to it.
-
     # If a symbol exists in both `typing` and `typing_extensions`, which
     # should you use? Prefer `typing_extensions` if the symbol available there.
     # in 4.1.1. In typing_extensions 4.7.0, `typing_extensions` started re-exporting
     # EVERYTHING from `typing` but this is not the case in v4.1.1.
+
+    # now that we're into modern typing_extensions versions, we should probably prefer that over built-in typing _unless_ all of our `typing `needs are present in all supported Python versions. In that case, we could drop `typing_extensions`. See: https://go/j/DEVSDK-3046
     allowed_typing_extensions_imports = [
         "Literal",
         "NoReturn",
@@ -36,6 +31,7 @@ class TypingImportsChecker:
         "Awaitable",
         "Never",
         "override",
+        "deprecated",
     ]
 
     allowed_typing_imports = [

pyproject.toml

@@ -6,7 +6,7 @@ description = "Python bindings for the Stripe API"
 authors = [{ name = "Stripe", email = "support@stripe.com" }]
 license-files = ["LICENSE"]
 keywords = ["stripe", "api", "payments"]
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Developers",
@@ -27,11 +27,9 @@ classifiers = [
 ]
 
 dependencies = [
-  "typing_extensions <= 4.2.0, > 3.7.2; python_version < '3.7'",
-  # The best typing support comes from 4.5.0+ but we can support down to
-  # 3.7.2 without throwing exceptions.
-  "typing_extensions >= 4.5.0; python_version >= '3.7'",
-  "requests >= 2.20; python_version >= '3.0'",
+  # this is the version where everything started getting re-exported, so it's a convenient backstop
+  "typing_extensions >= 4.7.0",
+  "requests >= 2.20",
 ]
 
 [project.optional-dependencies]

stripe/_account.py

@@ -1986,7 +1986,7 @@ def persons(  # pyright: ignore[reportGeneralTypeIssues]
             self._request(
                 "get",
                 "/v1/accounts/{account}/persons".format(
-                    account=sanitize_id(self.get("id"))
+                    account=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -2041,7 +2041,7 @@ async def persons_async(  # pyright: ignore[reportGeneralTypeIssues]
             await self._request_async(
                 "get",
                 "/v1/accounts/{account}/persons".format(
-                    account=sanitize_id(self.get("id"))
+                    account=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -2102,7 +2102,7 @@ def reject(  # pyright: ignore[reportGeneralTypeIssues]
             self._request(
                 "post",
                 "/v1/accounts/{account}/reject".format(
-                    account=sanitize_id(self.get("id"))
+                    account=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -2165,7 +2165,7 @@ async def reject_async(  # pyright: ignore[reportGeneralTypeIssues]
             await self._request_async(
                 "post",
                 "/v1/accounts/{account}/reject".format(
-                    account=sanitize_id(self.get("id"))
+                    account=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -2205,7 +2205,7 @@ def _build_instance_url(cls, sid):
         return "%s/%s" % (base, extn)
 
     def instance_url(self):
-        return self._build_instance_url(self.get("id"))
+        return self._build_instance_url(self._data.get("id"))
 
     def deauthorize(self, **params):
         params["stripe_user_id"] = self.id
@@ -2215,7 +2215,7 @@ def serialize(self, previous):
         params = super(Account, self).serialize(previous)
         previous = previous or self._previous or {}
 
-        for k, v in iter(self.items()):
+        for k, v in iter(self._data.items()):
             if k == "individual" and isinstance(v, Person) and k not in params:
                 params[k] = v.serialize(previous.get(k, None))
 

stripe/_api_resource.py

@@ -1,12 +1,11 @@
-from typing_extensions import Literal, Self
+from typing_extensions import Literal, Self, deprecated
 
 from stripe._error import InvalidRequestError
 from stripe._stripe_object import StripeObject
 from stripe._request_options import extract_options_from_dict
 from stripe._api_mode import ApiMode
 from stripe._base_address import BaseAddress
 from stripe._api_requestor import _APIRequestor
-from stripe import _util
 from urllib.parse import quote_plus
 from typing import (
     Any,
@@ -26,7 +25,7 @@ class APIResource(StripeObject, Generic[T]):
     OBJECT_NAME: ClassVar[str]
 
     @classmethod
-    @_util.deprecated(
+    @deprecated(
         "This method is deprecated and will be removed in a future version of stripe-python. Child classes of APIResource should define their own `retrieve` and use APIResource._request directly."
     )
     def retrieve(cls, id, **params) -> T:
@@ -55,7 +54,7 @@ def class_url(cls) -> str:
         return "/v1/%ss" % (base,)
 
     def instance_url(self) -> str:
-        id = self.get("id")
+        id = self._data.get("id")
 
         if not isinstance(id, str):
             raise InvalidRequestError(

stripe/_application_fee.py

@@ -258,7 +258,7 @@ def refund(  # pyright: ignore[reportGeneralTypeIssues]
             self._request(
                 "post",
                 "/v1/application_fees/{id}/refunds".format(
-                    id=sanitize_id(self.get("id"))
+                    id=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -343,7 +343,7 @@ async def refund_async(  # pyright: ignore[reportGeneralTypeIssues]
             await self._request_async(
                 "post",
                 "/v1/application_fees/{id}/refunds".format(
-                    id=sanitize_id(self.get("id"))
+                    id=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),

stripe/_charge.py

@@ -2677,7 +2677,7 @@ def capture(  # pyright: ignore[reportGeneralTypeIssues]
             self._request(
                 "post",
                 "/v1/charges/{charge}/capture".format(
-                    charge=sanitize_id(self.get("id"))
+                    charge=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -2748,7 +2748,7 @@ async def capture_async(  # pyright: ignore[reportGeneralTypeIssues]
             await self._request_async(
                 "post",
                 "/v1/charges/{charge}/capture".format(
-                    charge=sanitize_id(self.get("id"))
+                    charge=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),

stripe/_credit_note.py

@@ -633,7 +633,7 @@ def void_credit_note(  # pyright: ignore[reportGeneralTypeIssues]
             self._request(
                 "post",
                 "/v1/credit_notes/{id}/void".format(
-                    id=sanitize_id(self.get("id"))
+                    id=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),
@@ -686,7 +686,7 @@ async def void_credit_note_async(  # pyright: ignore[reportGeneralTypeIssues]
             await self._request_async(
                 "post",
                 "/v1/credit_notes/{id}/void".format(
-                    id=sanitize_id(self.get("id"))
+                    id=sanitize_id(self._data.get("id"))
                 ),
                 params=params,
             ),

stripe/_custom_method.py

@@ -1,10 +1,11 @@
 from typing import Optional
 from stripe import _util
 from urllib.parse import quote_plus
+from typing_extensions import deprecated
 
 
 # TODO(major): 1704.
-@_util.deprecated(
+@deprecated(
     "the custom_method class decorator will be removed in a future version of stripe-python. Define custom methods directly and use StripeObject._static_request within."
 )
 def custom_method(