diff options
| author | Larry Hastings <larry@hastings.org> | 2017-01-17 08:56:40 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2017-01-17 08:56:40 (GMT) |
| commit | 09e4ce5a951d19c96eb078d22e5eacb17d55b8de (patch) | |
| tree | 6579d3607474569d0247d3c0fe46ba218c805540 /Include | |
| parent | c620f200d619a92a5e5b0c76c5ee890894502d7c (diff) | |
| parent | 80490525e0e9c08860b0de0c416dbe71c6593af7 (diff) | |
| download | cpython-09e4ce5a951d19c96eb078d22e5eacb17d55b8de.zip cpython-09e4ce5a951d19c96eb078d22e5eacb17d55b8de.tar.gz cpython-09e4ce5a951d19c96eb078d22e5eacb17d55b8de.tar.bz2 | |
Merge 3.5.3 release head with main 3.5 branch.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/dictobject.h | 1 | ||||
| -rw-r--r-- | Include/patchlevel.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Include/dictobject.h b/Include/dictobject.h index e0e1c26..17e12c0 100644 --- a/Include/dictobject.h +++ b/Include/dictobject.h @@ -102,6 +102,7 @@ PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp); Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys); Py_ssize_t _PyDict_SizeOf(PyDictObject *); PyObject *_PyDict_Pop(PyDictObject *, PyObject *, PyObject *); +PyObject *_PyDict_Pop_KnownHash(PyDictObject *, PyObject *, Py_hash_t, PyObject *); PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *); #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL) diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 1ec9761..5e318cf 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -19,8 +19,8 @@ #define PY_MAJOR_VERSION 3 #define PY_MINOR_VERSION 5 #define PY_MICRO_VERSION 3 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL -#define PY_RELEASE_SERIAL 0 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA +#define PY_RELEASE_SERIAL 1 /* Version as a string */ #define PY_VERSION "3.5.3+" |