NotificationsYou must be signed in to change notification settings
Fork33.7k
Star70.4k

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

vstinner merged 3 commits intopython:mainfromcdce8p:export-pybytes-join

Jul 25, 2024

Merged

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

vstinner merged 3 commits intopython:mainfromcdce8p:export-pybytes-join

Jul 25, 2024

Conversation

Copy link

Contributor

cdce8p commentedJul 25, 2024•
edited by bedevere-appbot
Loading

Followup from#121489 and#121646 (comment). Export the_PyBytes_Join() again until the new publicPyBytes_Join() is added. If backported to3.13, this would make transitioning easier.

This partially reverts#107144.

/CC@vstinner

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

cdce8pand others added2 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

Copy link

ContributorAuthor

cdce8p commentedJul 25, 2024•
edited
Loading

@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 reviewed

Jul 25, 2024

View reviewed changes

Copy link

Member

encukou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

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

Misc/NEWS.d/next/C API/2024-07-21-17-40-07.gh-issue-121489.SUMFCr.rst OutdatedShow resolvedHide resolved

encukou added the needs backport to 3.13bugs 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

Copy link

Member

vstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM

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 commitaef95eb intopython:main

Jul 25, 2024

Copy link

miss-islington-appbot commentedJul 25, 2024

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

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 commitaef95eb)Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>

Copy link

bedevere-appbot commentedJul 25, 2024

GH-122287 is a backport of this pull request to the3.13 branch.

bedevere-appbot removed the needs backport to 3.13bugs and security fixes label

Jul 25, 2024

vstinner pushed a commit that referenced this pull request

Jul 25, 2024

[3.13]gh-121489: Export private _PyBytes_Join() again (GH-122267) (#…

dd270f6

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

Copy link

bedevere-bot commentedJul 25, 2024

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

Hi! The buildbotiOS ARM64 Simulator 3.x has failed when building commitaef95eb.

What do you need to do:

Don't panic.
Checkthe 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", line228, intest_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", line66, indecoratorreturn 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", line133, inrun_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", line160, indgram_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", line43, inreceiveraiseRuntimeError("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", line1039, 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", line990, inrunself._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", line694, inprocess_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", line692, inprocess_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", line362, infinish_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", line763, 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", line858, infinishself.socket.sendto(self.wfile.getvalue(),self.client_address)~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ConnectionResetError:[Errno 54] Connection reset by peerWarning -- threading_cleanup() failed to clean up threads in 1.0 secondsWarning --   before: thread count=0, dangling=1Warning --   after: thread count=1, dangling=3Warning -- 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

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

Copy link

Member

mhsmith commentedJul 26, 2024

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

Copy link

Contributor

freakboy3742 commentedJul 26, 2024

@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.