Skip to content

gh-120906: Support arbitrary hashable keys in FrameLocalsProxy #122309

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
encukou merged 10 commits into from
Jul 30, 2024
Merged

gh-120906: Support arbitrary hashable keys in FrameLocalsProxy #122309

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56b7a2d
gh-120906: Support arbitrary hashable keys in FrameLocalsProxy
encukou Jul 26, 2024
791e4fc
Run mapping protocol tests on FrameLocalsProxy
encukou Jul 26, 2024
03dc148
Revert to two loops
encukou Jul 27, 2024
ddc4384
Check that the hash matches
encukou Jul 27, 2024
4bba239
Apply test suggestions from code review
encukou Jul 27, 2024
d37d8f2
Early return for NULL/hidden values
encukou Jul 29, 2024
f5df751
Handle hidden values in the short-circuit
encukou Jul 29, 2024
34c3d24
Add comment in Objects/frameobject.c
encukou Jul 30, 2024
7d3e8b5
Test setting an unintialized local through the proxy
encukou Jul 30, 2024
6927ae0
Merge branch 'main' into frame_locals_eq
encukou Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Run mapping protocol tests on FrameLocalsProxy
  • Loading branch information
@encukou
encukou committed Jul 26, 2024
commit 791e4fccca1f835a3734c02d0b8a2f0ec97f5802
64 changes: 64 additions & 0 deletions Lib/test/test_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from test import support
from test.support import import_helper, threading_helper
from test.support.script_helper import assert_python_ok
from test import mapping_tests
Comment thread
picnixz marked this conversation as resolved.


class ClearTest(unittest.TestCase):
Expand Down Expand Up @@ -478,6 +479,69 @@ class ObjectSubclass:
proxy[obj] = 0


class FrameLocalsProxyMappingTests(mapping_tests.TestHashMappingProtocol):
"""Test that FrameLocalsProxy behaves like a Mapping (with exceptions)"""

def _f(*args, **kwargs):
def _f():
return sys._getframe().f_locals
return _f()
type2test = _f

@unittest.skipIf(True, 'Unlike a mapping: empty proxy != empty proxy')
Comment thread
encukou marked this conversation as resolved.
Outdated
def test_constructor(self):
pass

@unittest.skipIf(True, 'Unlike a mapping: del proxy[key] fails')
def test_write(self):
pass

@unittest.skipIf(True, 'Unlike a mapping: no proxy.popitem')
def test_popitem(self):
pass

@unittest.skipIf(True, 'Unlike a mapping: no proxy.pop')
def test_pop(self):
pass

@unittest.skipIf(True, 'Unlike a mapping: no proxy.clear')
def test_clear(self):
pass

@unittest.skipIf(True, 'Unlike a mapping: no proxy.fromkeys')
def test_fromkeys(self):
pass

# no del
def test_getitem(self):
mapping_tests.BasicTestMappingProtocol.test_getitem(self)
d = self._full_mapping({'a': 1, 'b': 2})
self.assertEqual(d['a'], 1)
self.assertEqual(d['b'], 2)
d['c'] = 3
d['a'] = 4
self.assertEqual(d['c'], 3)
self.assertEqual(d['a'], 4)

@unittest.skipIf(True, 'Unlike a mapping: no proxy.update')
def test_update(self):
pass

# proxy.copy rerourns a regular dict
Comment thread
encukou marked this conversation as resolved.
Outdated
def test_copy(self):
d = self._full_mapping({1:1, 2:2, 3:3})
self.assertEqual(d.copy(), {1:1, 2:2, 3:3})
d = self._empty_mapping()
self.assertEqual(d.copy(), d)
self.assertRaises(TypeError, d.copy, None)

self.assertIsInstance(d.copy(), dict)

@unittest.skipIf(True, 'Unlike a mapping: empty proxy != empty proxy')
Comment thread
encukou marked this conversation as resolved.
Outdated
def test_eq(self):
pass


class TestFrameCApi(unittest.TestCase):
def test_basic(self):
x = 1
Expand Down