Skip to content

Merge to beta - #1856

Merged
jar-stripe merged 12 commits into
betafrom
jar/merge-python-beta
Jul 28, 2026
Merged

Merge to beta#1856
jar-stripe merged 12 commits into
betafrom
jar/merge-python-beta

Conversation

@jar-stripe

Copy link
Copy Markdown
Contributor

Why?

Routine merge of master changes into the beta release channel.

What?

  • Merged master into beta using sdk-codegen's automerge tooling (tools/automerge/python-beta.yaml).
  • One manual conflict resolution in tests/test_integration.py: accepted master's new RequestSnapshot class (new utility not present on beta).

See Also

n/a

Changelog

n/a — no user-facing changes (merge only).

stripe-openapi Bot and others added 11 commits June 24, 2026 15:19
* Update generated code for v2323 and 1f0a7866ce5b5e12153c09a04349f91486b17d95

* Update generated code for v2324 and 6012b623b1c09ad54d466947da04511a042ee45a

---------

Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
* Replace source hash with telemetry UUID

* minor tweaks

* Add/adjust tests & CI
…1853)

* Fix intermittent Windows test flake in async httpx integration tests

BaseHTTPRequestHandler defaults to protocol_version "HTTP/1.0", which
sets close_connection=True after every response. On Windows, the socket
close can race with the async httpx client reading the response body,
causing ReadError (Windows discards buffered TCP data on RST more
aggressively than Linux).

Setting protocol_version to "HTTP/1.1" keeps the connection alive,
eliminating the race. The 30s timeout is a backstop against the handler
blocking on readline if the client never closes the connection.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* Drain request body in mock handler for HTTP/1.1 keep-alive

With protocol_version set to HTTP/1.1, the server keeps the connection
alive and reads the next request from the same socket. If the POST body
isn't consumed, those bytes remain in the buffer and get misinterpreted
as the next HTTP request line.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* Snapshot request attributes for HTTP/1.1 keep-alive handler reuse

With keep-alive, multiple requests are handled by the same
BaseHTTPRequestHandler instance. Storing `self` in the queue meant all
entries shared the same mutable object whose .headers/.path/.command
reflect only the last request. Capture a snapshot at handle time instead.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

# Conflicts:
#	CHANGELOG.md
#	VERSION
#	pyproject.toml
#	stripe/_api_version.py
#	stripe/_payment_intent.py
#	stripe/_subscription.py
#	stripe/_version.py
#	stripe/financial_connections/_account.py
#	stripe/params/__init__.py
#	stripe/params/_invoice_create_params.py
#	stripe/params/_invoice_modify_params.py
#	stripe/params/_invoice_update_params.py
#	stripe/params/_payment_intent_confirm_params.py
#	stripe/params/_payment_intent_create_params.py
#	stripe/params/_payment_intent_modify_params.py
#	stripe/params/_payment_intent_update_params.py
#	stripe/params/_subscription_create_params.py
#	stripe/params/_subscription_modify_params.py
#	stripe/params/_subscription_update_params.py
#	stripe/reserve/_hold.py
#	tests/test_integration.py
@jar-stripe
jar-stripe requested a review from a team as a code owner July 28, 2026 21:09
@jar-stripe
jar-stripe requested review from xavdid and removed request for a team July 28, 2026 21:09
@jar-stripe
jar-stripe enabled auto-merge July 28, 2026 21:09
@jar-stripe
jar-stripe merged commit 8a68482 into beta Jul 28, 2026
17 checks passed
@jar-stripe
jar-stripe deleted the jar/merge-python-beta branch July 28, 2026 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants