diff options
| author | Guido van Rossum <guido@python.org> | 2020-05-14 19:01:14 -0700 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2020-05-14 19:01:14 -0700 |
| commit | f93a54c48fc1644012aa0d4ee3887c1d121ac40e (patch) | |
| tree | 189c841245d15318e5895638105bdbc532cbcdf5 /Include/cpython | |
| parent | 31641ff0e4b18c8d002d019f4506f0e8fb446983 (diff) | |
| parent | 16ab07063cb564c1937714bd39d6915172f005b5 (diff) | |
| download | cpython-git-fix-traceback-syntax-error.tar.gz | |
Merge branch 'master' into fix-traceback-syntax-errorfix-traceback-syntax-error
Diffstat (limited to 'Include/cpython')
| -rw-r--r-- | Include/cpython/object.h | 2 | ||||
| -rw-r--r-- | Include/cpython/unicodeobject.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Include/cpython/object.h b/Include/cpython/object.h index 8bf05a3271..444f832f5b 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -36,7 +36,7 @@ PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); PyId_foo is a static variable, either on block level or file level. On first usage, the string "foo" is interned, and the structures are linked. On interpreter - shutdown, all strings are released (through _PyUnicode_ClearStaticStrings). + shutdown, all strings are released. Alternatively, _Py_static_string allows choosing the variable name. _PyUnicode_FromId returns a borrowed reference to the interned string. diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h index 9432687629..4fd674ffea 100644 --- a/Include/cpython/unicodeobject.h +++ b/Include/cpython/unicodeobject.h @@ -1215,8 +1215,6 @@ Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE*) PyUnicode_AsUnicodeCopy( /* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/ PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*); -/* Clear all static strings. */ -PyAPI_FUNC(void) _PyUnicode_ClearStaticStrings(void); /* Fast equality check when the inputs are known to be exact unicode types and where the hash values are equal (i.e. a very probable match) */ |