GH-120097: Make FrameLocalsProxy a mapping #120101

markshannon · 2024-06-05T09:35:00Z

Issue: FrameLocalsProxy is not a mapping #120097

Lib/_collections_abc.py

sobolevn · 2024-06-05T10:06:02Z

Lib/test/test_frame.py

@@ -420,6 +421,17 @@ def test_unsupport(self):
        with self.assertRaises(TypeError):
            copy.deepcopy(d)

+    def test_is_mapping(self):
+        x = 1


Why do you need x? To fill f_locals? In this case I propose to use a inner function. Or maybe two: with and without locals.

The contents are irrelevant, but we want something just to make sure we are testing the right thing.
Without x = 1, the locals would just be {} and it would be too easy to mistakenly test the wrong mapping.

Lib/_collections_abc.py

Co-authored-by: Nikita Sobolev <[email protected]>

gaogaotiantian · 2024-06-10T18:01:39Z

Is the test failure related?

miss-islington-app · 2024-06-19T17:03:52Z

Thanks @markshannon for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

* Register FrameLocalsProxy as a subclass of collections.abc.Mapping * Allow FrameLocalsProxy to matching mapping patterns (cherry picked from commit d1c673b) Co-authored-by: Mark Shannon <[email protected]>

bedevere-app · 2024-06-19T17:04:03Z

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

* Register FrameLocalsProxy as a subclass of collections.abc.Mapping * Allow FrameLocalsProxy to matching mapping patterns

) Co-authored-by: Alyssa Coghlan <[email protected]>

bedevere-bot · 2024-08-23T09:50:44Z

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

Hi! The buildbot iOS ARM64 Simulator 3.13 has failed when building commit 95b4f9c.

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/1386/builds/503) and take a look at the build logs.
Check if the failure is related to this commit (95b4f9c) 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/1386/builds/503

Failed tests:

test_socketserver

Failed subtests:

test_UnixDatagramServer - test.test_socketserver.SocketServerTest.test_UnixDatagramServer
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/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/threading.py", line 1041, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/threading.py", line 992, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 694, in process_request_thread
    self.handle_error(request, client_address)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 692, in process_request_thread
    self.finish_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 362, in finish_request
    self.RequestHandlerClass(request, client_address, self)
    ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 763, in __init__
    self.finish()
    ~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 858, in finish
    self.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=4
Warning -- Dangling thread: <_MainThread(MainThread, started 4366598720)>
Warning -- Dangling thread: <Thread(Thread-2873 (process_request_thread), stopped 6137769984)>
Warning -- Dangling thread: <Thread(<class 'socketserver.ThreadingUnixDatagramServer'> serving, started daemon 6120943616)>
Warning -- Dangling thread: <Thread(Thread-2874 (process_request_thread), stopped 6154596352)>
ERROR


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 228, in test_ThreadingUnixDatagramServer
    self.run_server(socketserver.ThreadingUnixDatagramServer,
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    socketserver.DatagramRequestHandler,
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    self.dgram_examine)
                    ^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/support/threading_helper.py", line 66, in decorator
    return func(*args)
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 133, in run_server
    testfunc(svrcls.address_family, addr)
    ~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 160, in dgram_examine
    buf = data = receive(s, 100)
                 ~~~~~~~^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 43, in receive
    raise RuntimeError("timed out on %r" % (sock,))
RuntimeError: timed out on <socket.socket fd=33, family=1, type=2, proto=0, laddr=./test_python__imgs0_7.sock>


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/threading.py", line 1041, in _bootstrap_inner
    self.run()
    ~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/threading.py", line 992, in run
    self._target(*self._args, **self._kwargs)
    ~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 240, in serve_forever
    self._handle_request_noblock()
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 320, in _handle_request_noblock
    self.handle_error(request, client_address)
    ~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 318, in _handle_request_noblock
    self.process_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 349, in process_request
    self.finish_request(request, client_address)
    ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 362, in finish_request
    self.RequestHandlerClass(request, client_address, self)
    ~~~~~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 763, in __init__
    self.finish()
    ~~~~~~~~~~~^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/socketserver.py", line 858, in finish
    self.socket.sendto(self.wfile.getvalue(), self.client_address)
    ~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
ConnectionResetError: [Errno 54] Connection reset by peer
ERROR


Traceback (most recent call last):
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 222, in test_UnixDatagramServer
    self.run_server(socketserver.UnixDatagramServer,
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    socketserver.DatagramRequestHandler,
                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                    self.dgram_examine)
                    ^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/support/threading_helper.py", line 66, in decorator
    return func(*args)
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 133, in run_server
    testfunc(svrcls.address_family, addr)
    ~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 160, in dgram_examine
    buf = data = receive(s, 100)
                 ~~~~~~~^^^^^^^^
  File "/Users/buildbot/Library/Developer/XCTestDevices/F4BBB41D-5207-4016-951B-2DC02AC8DD0F/data/Containers/Bundle/Application/150C37C0-A406-4BC6-B95F-53E7B448E825/iOSTestbed.app/python/lib/python3.13/test/test_socketserver.py", line 43, in receive
    raise RuntimeError("timed out on %r" % (sock,))
RuntimeError: timed out on <socket.socket fd=34, family=1, type=2, proto=0, laddr=./test_python_sow1nfse.sock>

markshannon added 2 commits June 5, 2024 10:31

Make FrameLocalsProxy subclass collections.abc.Mapping

3bdabf1

add news

ca491ef

markshannon requested a review from rhettinger as a code owner June 5, 2024 09:35

bedevere-app bot added the awaiting core review label Jun 5, 2024

bedevere-app bot mentioned this pull request Jun 5, 2024

FrameLocalsProxy is not a mapping #120097

Closed

markshannon changed the title ~~GH-120097: Make locals proxy mapping~~ GH-120097: Make FrameLocalsProxy a mapping Jun 5, 2024

sobolevn reviewed Jun 5, 2024

View reviewed changes

Lib/_collections_abc.py Outdated Show resolved Hide resolved

Update Lib/_collections_abc.py

544090d

Co-authored-by: Nikita Sobolev <[email protected]>

markshannon requested a review from gaogaotiantian June 7, 2024 15:54

Fix renaming

d25a8b3

iritkatriel approved these changes Jun 19, 2024

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting core review labels Jun 19, 2024

markshannon merged commit d1c673b into python:main Jun 19, 2024
38 checks passed

bedevere-app bot removed the awaiting merge label Jun 19, 2024

AlexWaygood added the needs backport to 3.13 bugs and security fixes label Jun 19, 2024

bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 19, 2024

mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024

pythonGH-120097: Make FrameLocalsProxy a mapping (python#120101)

5639472

* Register FrameLocalsProxy as a subclass of collections.abc.Mapping * Allow FrameLocalsProxy to matching mapping patterns

noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024

pythonGH-120097: Make FrameLocalsProxy a mapping (python#120101)

387aa06

* Register FrameLocalsProxy as a subclass of collections.abc.Mapping * Allow FrameLocalsProxy to matching mapping patterns

estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024

pythonGH-120097: Make FrameLocalsProxy a mapping (python#120101)

b3a69be

* Register FrameLocalsProxy as a subclass of collections.abc.Mapping * Allow FrameLocalsProxy to matching mapping patterns

markshannon deleted the make-locals-proxy-mapping branch August 6, 2024 10:15

markshannon pushed a commit that referenced this pull request Aug 23, 2024

[3.13] GH-120097: Make FrameLocalsProxy a mapping (GH-120101) (GH-120749

95b4f9c

) Co-authored-by: Alyssa Coghlan <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

GH-120097: Make FrameLocalsProxy a mapping #120101

GH-120097: Make FrameLocalsProxy a mapping #120101

Uh oh!

markshannon commented Jun 5, 2024 •

edited by bedevere-app bot

Loading

Uh oh!

Uh oh!

sobolevn Jun 5, 2024 •

edited

Loading

Uh oh!

markshannon Jun 7, 2024 •

edited

Loading

Uh oh!

Uh oh!

gaogaotiantian commented Jun 10, 2024

Uh oh!

Uh oh!

miss-islington-app bot commented Jun 19, 2024

Uh oh!

bedevere-app bot commented Jun 19, 2024

Uh oh!

bedevere-bot commented Aug 23, 2024

Uh oh!

Uh oh!

Uh oh!

GH-120097: Make FrameLocalsProxy a mapping #120101

GH-120097: Make FrameLocalsProxy a mapping #120101

Uh oh!

Conversation

markshannon commented Jun 5, 2024 • edited by bedevere-app bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

sobolevn Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

markshannon Jun 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gaogaotiantian commented Jun 10, 2024

Uh oh!

Uh oh!

miss-islington-app bot commented Jun 19, 2024

Uh oh!

bedevere-app bot commented Jun 19, 2024

Uh oh!

bedevere-bot commented Aug 23, 2024

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

Uh oh!

Uh oh!

markshannon commented Jun 5, 2024 •

edited by bedevere-app bot

Loading

sobolevn Jun 5, 2024 •

edited

Loading

markshannon Jun 7, 2024 •

edited

Loading