Skip to content

bpo-40275: Use new test.support helper submodules in tests #21317

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
vstinner merged 13 commits into from
Jul 6, 2020
Merged

bpo-40275: Use new test.support helper submodules in tests #21317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b9c29f3
Use new test.support helper submodules in tests
shihai1991 Jul 4, 2020
b51f3ca
bpo-41204: Fix compiler warning in ast_type_init() (GH-21307)
vstinner Jul 4, 2020
4ecd411
Uncomment Py_DEPRECATED for Py_UNICODE APIs (GH-21318)
methane Jul 5, 2020
20d5076
bpo-41211: Doc: Fix PyLong_FromUnicodeObject (GH-21325)
methane Jul 5, 2020
246b2de
bpo-39168: Remove the __new__ method of typing.Generic (GH-21327)
ZackerySpytz Jul 5, 2020
bca1003
bpo-36346: Undeprecate private function _PyUnicode_AsUnicode(). (GH-2…
serhiy-storchaka Jul 5, 2020
78fc4bc
bpo-29727: Register array.array as a MutableSequence (GH-21338)
pablogsal Jul 5, 2020
a085bc2
bpo-26205: Specify the number of nested scopes (GH-21324)
nanjekyejoannah Jul 6, 2020
f3ebc64
bpo-28681: Clarify multiple function names in the tutorial (GH-21340)
nanjekyejoannah Jul 6, 2020
4b54378
bpo-41165: Deprecate PyEval_ReleaseLock() (GH-21309)
methane Jul 6, 2020
abbf2ff
bpo-40275: Use new test.support helper submodules in tests (GH-21314)
shihai1991 Jul 6, 2020
a32eec0
bpo-40275: Use new test.support helper submodules in tests (GH-21315)
shihai1991 Jul 6, 2020
20f3291
Merge remote-tracking branch 'origin/master' into bpo_40275_helper_re…
shihai1991 Jul 6, 2020
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
bpo-36346: Undeprecate private function _PyUnicode_AsUnicode(). (GH-2… 
…1336)
  • Loading branch information
@serhiy-storchaka @shihai1991
serhiy-storchaka authored and shihai1991 committed Jul 6, 2020
commit bca1003be709c050c4038c5d6e782d90027737b5
2 changes: 1 addition & 1 deletion Include/cpython/unicodeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode(

/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string
contains null characters. */
Py_DEPRECATED(3.3) PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode(
PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode(
PyObject *unicode /* Unicode object */
);

Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/C API/2020-06-17-11-24-00.bpo-36346.fTMr3S.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Mark ``Py_UNICODE_COPY``, ``Py_UNICODE_FILL``, ``PyUnicode_WSTR_LENGTH``,
``PyUnicode_FromUnicode``, ``PyUnicode_AsUnicode``, ``_PyUnicode_AsUnicode``,
``PyUnicode_FromUnicode``, ``PyUnicode_AsUnicode``,
and ``PyUnicode_AsUnicodeAndSize`` as deprecated in C. Remove ``Py_UNICODE_MATCH``
which was deprecated and broken since Python 3.3.
8 changes: 1 addition & 7 deletions Modules/clinic/posixmodule.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3310,14 +3310,11 @@ _PyUnicode_WideCharString_Converter(PyObject *obj, void *ptr)
}
if (PyUnicode_Check(obj)) {
#if USE_UNICODE_WCHAR_CACHE
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
*p = (wchar_t *)_PyUnicode_AsUnicode(obj);
if (*p == NULL) {
return 0;
}
return 1;
_Py_COMP_DIAG_POP
#else /* USE_UNICODE_WCHAR_CACHE */
*p = PyUnicode_AsWideCharString(obj, NULL);
if (*p == NULL) {
Expand Down Expand Up @@ -3349,14 +3346,11 @@ _PyUnicode_WideCharString_Opt_Converter(PyObject *obj, void *ptr)
}
if (PyUnicode_Check(obj)) {
#if USE_UNICODE_WCHAR_CACHE
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
*p = (wchar_t *)_PyUnicode_AsUnicode(obj);
if (*p == NULL) {
return 0;
}
return 1;
_Py_COMP_DIAG_POP
#else /* USE_UNICODE_WCHAR_CACHE */
*p = PyUnicode_AsWideCharString(obj, NULL);
if (*p == NULL) {
Expand Down
3 changes: 0 additions & 3 deletions PC/_msi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,10 +758,7 @@ _msi_SummaryInformation_SetProperty_impl(msiobj *self, int field,

if (PyUnicode_Check(data)) {
#if USE_UNICODE_WCHAR_CACHE
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
const WCHAR *value = _PyUnicode_AsUnicode(data);
_Py_COMP_DIAG_POP
#else /* USE_UNICODE_WCHAR_CACHE */
WCHAR *value = PyUnicode_AsWideCharString(data, NULL);
#endif /* USE_UNICODE_WCHAR_CACHE */
Expand Down
14 changes: 1 addition & 13 deletions PC/clinic/_msi.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 1 addition & 31 deletions PC/clinic/winreg.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3414,10 +3414,7 @@ def parse_arg(self, argname, argnum):
goto exit;
}}}}
#if USE_UNICODE_WCHAR_CACHE
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
{paramname} = _PyUnicode_AsUnicode({argname});
_Py_COMP_DIAG_POP
#else /* USE_UNICODE_WCHAR_CACHE */
{paramname} = PyUnicode_AsWideCharString({argname}, NULL);
#endif /* USE_UNICODE_WCHAR_CACHE */
Expand All @@ -3432,10 +3429,7 @@ def parse_arg(self, argname, argnum):
}}}}
else if (PyUnicode_Check({argname})) {{{{
#if USE_UNICODE_WCHAR_CACHE
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
{paramname} = _PyUnicode_AsUnicode({argname});
_Py_COMP_DIAG_POP
#else /* USE_UNICODE_WCHAR_CACHE */
{paramname} = PyUnicode_AsWideCharString({argname}, NULL);
#endif /* USE_UNICODE_WCHAR_CACHE */
Expand Down