gh-121489: Export private _PyBytes_Join() again by cdce8p · Pull Request #122267 · python/cpython

cdce8p · 2024-07-25T09:10:38Z

Followup from #121489 and #121646 (comment). Export the _PyBytes_Join() again until the new public PyBytes_Join() is added. If backported to 3.13, this would make transitioning easier.

This partially reverts #107144.

/CC @vstinner

Issue: [C API] Private functions used by mypyc #121489

Co-authored-by: Petr Viktorin <encukou@gmail.com>

cdce8p · 2024-07-25T09:12:14Z

@encukou Seems we had a little misunderstanding here 😅 Sorry about that. Merging it into main and then backporting it to 3.13 was what I had in mind to begin with.

encukou

IMO this should be backported to 3.13 as the replacement is not available there.
I'll merge tomorrow if there are no objections.

Co-authored-by: Petr Viktorin <encukou@gmail.com>

vstinner

LGTM

miss-islington-app · 2024-07-25T15:31:34Z

Thanks @cdce8p for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

(cherry picked from commit aef95eb) Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

bedevere-app · 2024-07-25T15:31:46Z

GH-122287 is a backport of this pull request to the 3.13 branch.

…122287) gh-121489: Export private _PyBytes_Join() again (GH-122267) (cherry picked from commit aef95eb) Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

bedevere-bot · 2024-07-25T16:21:40Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot iOS ARM64 Simulator 3.x has failed when building commit aef95eb.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/#builders/1380/builds/922) and take a look at the build logs.
Check if the failure is related to this commit (aef95eb) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#builders/1380/builds/922

Failed tests:

test_socketserver

Failed subtests:

test_ThreadingUnixDatagramServer - test.test_socketserver.SocketServerTest.test_ThreadingUnixDatagramServer

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 228, in test_ThreadingUnixDatagramServerself.run_server(socketserver.ThreadingUnixDatagramServer,
~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
socketserver.DatagramRequestHandler,
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^self.dgram_examine)
^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/support/threading_helper.py", line 66, in decoratorreturn func(*args)
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 133, in run_server
testfunc(svrcls.address_family, addr)
~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 160, in dgram_examine
buf = data = receive(s, 100)
~~~~~~~^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/test/test_socketserver.py", line 43, in receiveraiseRuntimeError("timed out on %r"% (sock,))
RuntimeError: timed out on <socket.socket fd=24, family=1, type=2, proto=0, laddr=./test_python_gi6ji1ee.sock>
Traceback (most recent call last):
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/threading.py", line 1039, in _bootstrap_innerself.run()
~~~~~~~~^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/threading.py", line 990, in runself._target(*self._args, **self._kwargs)
~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 694, in process_request_threadself.handle_error(request, client_address)
~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 692, in process_request_threadself.finish_request(request, client_address)
~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 362, in finish_requestself.RequestHandlerClass(request, client_address, self)
~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 763, in __init__self.finish()
~~~~~~~~~~~^^
File "/Users/buildbot/Library/Developer/XCTestDevices/F05B2E02-3C3F-4FF7-A55F-11613958B0BB/data/Containers/Bundle/Application/99A3AB7F-A1D2-4792-B4C8-CC021997CCB1/iOSTestbed.app/python/lib/python3.14/socketserver.py", line 858, in finishself.socket.sendto(self.wfile.getvalue(), self.client_address)
~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ConnectionResetError: [Errno 54] Connection reset by peer
Warning -- threading_cleanup() failed to clean up threads in 1.0 seconds
Warning -- before: thread count=0, dangling=1
Warning -- after: thread count=1, dangling=3
Warning -- Dangling thread: <Thread(<class 'socketserver.ThreadingUnixDatagramServer'> serving, started daemon 6115389440)>
Warning -- Dangling thread: <Thread(Thread-2873 (process_request_thread), stopped 6132215808)>
Warning -- Dangling thread: <_MainThread(MainThread, started 4372660800)>
ERROR

mhsmith · 2024-07-26T00:19:05Z

@freakboy3742: The iOS buildbot has failed this way a few times now. It looks like it's specific to the datagram server test, rather than a random failure of networking in general.

freakboy3742 · 2024-07-26T00:42:36Z

@mhsmith Yes - I've seen that, but it appears to be a transient problem; subsequent builds work fine. I haven't been able to reproduce locally, but it appears to be related to load - it seems to coincide with longer than usual test runtimes.

cdce8pand others added 2 commits July 21, 2024 17:41

pythongh-121489: Export private _PyBytes_Join() again
27db060

Code review
0b98ed4
Co-authored-by: Petr Viktorin <encukou@gmail.com>

bedevere-appBot mentioned this pull request Jul 25, 2024
[C API] Private functions used by mypyc #121489
Closed

bedevere-appBot added the awaiting review label Jul 25, 2024

encukou reviewed Jul 25, 2024
View reviewed changes

Comment threadMisc/NEWS.d/next/C API/2024-07-21-17-40-07.gh-issue-121489.SUMFCr.rst Outdated

encukou added the needs backport to 3.13 bugs and security fixes label Jul 25, 2024

Fix news entry
5d2f555
Co-authored-by: Petr Viktorin <encukou@gmail.com>

vstinner approved these changes Jul 25, 2024
View reviewed changes

bedevere-appBot added awaiting merge and removed awaiting review labels Jul 25, 2024

kumaraditya303 approved these changes Jul 25, 2024
View reviewed changes

vstinner merged commit aef95eb into python:mainJul 25, 2024

bedevere-appBot removed the awaiting merge label Jul 25, 2024

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 25, 2024
pythongh-121489: Export private _PyBytes_Join() again (pythonGH-122267)
15a08b0
(cherry picked from commit aef95eb) Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

bedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Jul 25, 2024

cdce8p deleted the export-pybytes-join branch July 25, 2024 16:42

cdce8p mentioned this pull request Jul 25, 2024
gh-121645: Add PyBytes_Join() function #121646
Merged

Navigation Menu

Uh oh!

Uh oh!

gh-121489: Export private _PyBytes_Join() again - #122267

gh-121489: Export private _PyBytes_Join() again#122267
vstinner merged 3 commits into
python:mainfrom
cdce8p:export-pybytes-join

cdce8p commented Jul 25, 2024•
edited by bedevere-app Bot
Loading

Uh oh!

cdce8p commented Jul 25, 2024•
edited
Loading

Uh oh!

encukou left a comment

Uh oh!

Uh oh!

vstinner left a comment

Uh oh!

miss-islington-appBot commented Jul 25, 2024

Uh oh!

bedevere-appBot commented Jul 25, 2024

Uh oh!

bedevere-bot commented Jul 25, 2024

Uh oh!

mhsmith commented Jul 26, 2024

Uh oh!

freakboy3742 commented Jul 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Uh oh!

Conversation

cdce8p commented Jul 25, 2024• edited by bedevere-app BotLoading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cdce8p commented Jul 25, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

encukou left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

miss-islington-appBot commented Jul 25, 2024

Uh oh!

bedevere-appBot commented Jul 25, 2024

Uh oh!

bedevere-bot commented Jul 25, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

mhsmith commented Jul 26, 2024

Uh oh!

freakboy3742 commented Jul 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cdce8p commented Jul 25, 2024•
edited by bedevere-app Bot
Loading

cdce8p commented Jul 25, 2024•
edited
Loading