Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-108512: Add and use new replacements for PySys_GetObject()#111035

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

Merged
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
24 commits
Select commitHold shift + click to select a range
4d0f508
gh-108512: Add and use new replacements for PySys_GetObject()
serhiy-storchakaSep 20, 2023
eb42b39
Update Misc/stable_abi.toml
serhiy-storchakaOct 18, 2023
2d4588d
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaOct 18, 2023
2eb9533
Add tests.
serhiy-storchakaOct 19, 2023
9fc2f3d
Apply suggestions from code review
serhiy-storchakaOct 19, 2023
65713ce
Address review comments.
serhiy-storchakaOct 19, 2023
e6ecf11
Check that the name is a string.
serhiy-storchakaOct 19, 2023
8a0f5f2
Merge remote-tracking branch 'refs/remotes/origin/capi-PySys_GetAttr'…
serhiy-storchakaOct 19, 2023
516829e
Make the new C API not public.
serhiy-storchakaOct 19, 2023
9503aaf
Remove from Misc/stable_abi.toml.
serhiy-storchakaOct 19, 2023
e2857ef
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaJan 28, 2025
dc26ec2
Add to the limited C API.
serhiy-storchakaJan 28, 2025
104dcc2
Replace few new occurrences of PySys_GetObject().
serhiy-storchakaJan 28, 2025
cf75fc3
Update the documentation.
serhiy-storchakaJan 28, 2025
9434659
Clean up.
serhiy-storchakaJan 28, 2025
56639d8
Fix a typo.
serhiy-storchakaJan 28, 2025
b40a665
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaFeb 6, 2025
03b9c0a
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaFeb 6, 2025
5d793c5
Merge remote-tracking branch 'refs/remotes/origin/capi-PySys_GetAttr'…
serhiy-storchakaFeb 6, 2025
09869ed
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaFeb 25, 2025
439bc3c
Merge branch 'main' into capi-PySys_GetAttr
serhiy-storchakaMay 21, 2025
93ab31b
Move to 3.15.
serhiy-storchakaMay 21, 2025
154a82a
Address review comments.
serhiy-storchakaMay 22, 2025
81c7605
Improve tests.
serhiy-storchakaMay 22, 2025
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
PrevPrevious commit
NextNext commit
Address review comments.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committedOct 19, 2023
commit65713ce3c355f0ade2ba31869473413045bb12aa
38 changes: 19 additions & 19 deletionsLib/test/test_capi/test_misc.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1113,39 +1113,39 @@ def test_sys_getattr(self):
# CRASHES sys_getattr(NULL)

def test_sys_getattrstring(self):
sys_getattr = _testcapi.sys_getattrstring
getattrstring = _testcapi.sys_getattrstring

self.assertIs(sys_getattr(b'stdout'), sys.stdout)
self.assertIs(getattrstring(b'stdout'), sys.stdout)
with support.swap_attr(sys, '\U0001f40d', 42):
self.assertEqual(sys_getattr('\U0001f40d'.encode()), 42)
self.assertEqual(getattrstring('\U0001f40d'.encode()), 42)

with self.assertRaisesRegex(RuntimeError, r'lost sys\.nonexisting'):
sys_getattr(b'nonexisting')
self.assertRaises(UnicodeDecodeError,sys_getattr, b'\xff')
# CRASHESsys_getattr(NULL)
getattrstring(b'nonexisting')
self.assertRaises(UnicodeDecodeError,getattrstring, b'\xff')
# CRASHESgetattrstring(NULL)

def test_sys_getoptionalattr(self):
sys_getattr = _testcapi.sys_getoptionalattr
getoptionalattr = _testcapi.sys_getoptionalattr

self.assertIs(sys_getattr('stdout'), sys.stdout)
self.assertIs(getoptionalattr('stdout'), sys.stdout)
with support.swap_attr(sys, '\U0001f40d', 42):
self.assertEqual(sys_getattr('\U0001f40d'), 42)
self.assertEqual(getoptionalattr('\U0001f40d'), 42)

self.assertIs(sys_getattr('nonexisting'), AttributeError)
self.assertIs(sys_getattr(1), AttributeError)
self.assertRaises(TypeError,sys_getattr, [])
# CRASHESsys_getattr(NULL)
self.assertIs(getoptionalattr('nonexisting'), AttributeError)
self.assertIs(getoptionalattr(1), AttributeError)
self.assertRaises(TypeError,getoptionalattr, [])
# CRASHESgetoptionalattr(NULL)

def test_sys_getoptionalattrstring(self):
sys_getattr = _testcapi.sys_getoptionalattrstring
getoptionalattrstring = _testcapi.sys_getoptionalattrstring

self.assertIs(sys_getattr(b'stdout'), sys.stdout)
self.assertIs(getoptionalattrstring(b'stdout'), sys.stdout)
with support.swap_attr(sys, '\U0001f40d', 42):
self.assertEqual(sys_getattr('\U0001f40d'.encode()), 42)
self.assertEqual(getoptionalattrstring('\U0001f40d'.encode()), 42)

self.assertIs(sys_getattr(b'nonexisting'), AttributeError)
self.assertRaises(UnicodeDecodeError,sys_getattr, b'\xff')
# CRASHESsys_getattr(NULL)
self.assertIs(getoptionalattrstring(b'nonexisting'), AttributeError)
self.assertRaises(UnicodeDecodeError,getoptionalattrstring, b'\xff')
# CRASHESgetoptionalattrstring(NULL)

def test_sys_getobject(self):
getobject = _testcapi.sys_getobject
Expand Down
24 changes: 4 additions & 20 deletionsModules/_testcapimodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3235,15 +3235,7 @@ static PyObject *
sys_getattr(PyObject *Py_UNUSED(module), PyObject *name)
{
NULLABLE(name);
PyObject *result = PySys_GetAttr(name);
if (result == NULL && PyErr_Occurred()) {
return NULL;
}
if (result == NULL) {
result = PyExc_AttributeError;
Py_INCREF(PyExc_AttributeError);
}
return result;
return PySys_GetAttr(name);
}

static PyObject *
Expand All@@ -3254,15 +3246,7 @@ sys_getattrstring(PyObject *Py_UNUSED(module), PyObject *arg)
if (!PyArg_Parse(arg, "z#", &name, &size)) {
return NULL;
}
PyObject *result = PySys_GetAttrString(name);
if (result == NULL && PyErr_Occurred()) {
return NULL;
}
if (result == NULL) {
result = PyExc_AttributeError;
Py_INCREF(PyExc_AttributeError);
}
return result;
return PySys_GetAttrString(name);
}

static PyObject *
Expand All@@ -3274,6 +3258,7 @@ sys_getoptionalattr(PyObject *Py_UNUSED(module), PyObject *name)
switch (PySys_GetOptionalAttr(name, &value)) {
case -1:
assert(value == NULL);
Copy link
Member

Choose a reason for hiding this comment

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

I suggest adding:assert(PyErr_Occurred());. Same remark in sys_getoptionalattrstring().

Copy link
MemberAuthor

Choose a reason for hiding this comment

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

Isn't there a check that each function that returns NULL should also set an exception? I relied on this in all other tests.

assert(PyErr_Occurred());
return NULL;
case 0:
assert(value == NULL);
Expand All@@ -3282,7 +3267,6 @@ sys_getoptionalattr(PyObject *Py_UNUSED(module), PyObject *name)
return value;
default:
Py_FatalError("PySys_GetOptionalAttr() returned invalid code");
Py_UNREACHABLE();
}
}

Expand All@@ -3299,6 +3283,7 @@ sys_getoptionalattrstring(PyObject *Py_UNUSED(module), PyObject *arg)
switch (PySys_GetOptionalAttrString(name, &value)) {
case -1:
assert(value == NULL);
assert(PyErr_Occurred());
return NULL;
case 0:
assert(value == NULL);
Expand All@@ -3307,7 +3292,6 @@ sys_getoptionalattrstring(PyObject *Py_UNUSED(module), PyObject *arg)
return value;
default:
Py_FatalError("PySys_GetOptionalAttrString() returned invalid code");
Py_UNREACHABLE();
}
}

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp