diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-08-24 10:19:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 10:19:51 (GMT) |
| commit | 076d0b9f5def35aeb0f8e8aadf658dc35aace81d (patch) | |
| tree | 2c807faeb8f60c5ddc26a8968e8c9da50c7716f2 | |
| parent | ef3ccd737020a0bb49ea0bfe48069f89bb5370a1 (diff) | |
| download | cpython-076d0b9f5def35aeb0f8e8aadf658dc35aace81d.zip cpython-076d0b9f5def35aeb0f8e8aadf658dc35aace81d.tar.gz cpython-076d0b9f5def35aeb0f8e8aadf658dc35aace81d.tar.bz2 | |
bpo-29535: Remove promize about hash randomization of datetime objects. (GH-15269)
(cherry picked from commit e9c90aa43144b0be1e4e393e8cb549573437a5da)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
| -rw-r--r-- | Doc/reference/datamodel.rst | 4 | ||||
| -rw-r--r-- | Doc/using/cmdline.rst | 4 | ||||
| -rw-r--r-- | Misc/python.man | 2 | ||||
| -rw-r--r-- | Python/initconfig.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index fa47bf1..1dd8e42 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -1445,8 +1445,8 @@ Basic customization .. note:: - By default, the :meth:`__hash__` values of str, bytes and datetime - objects are "salted" with an unpredictable random value. Although they + By default, the :meth:`__hash__` values of str and bytes objects are + "salted" with an unpredictable random value. Although they remain constant within an individual Python process, they are not predictable between repeated invocations of Python. diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 6bc440f..50143f2 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -302,7 +302,7 @@ Miscellaneous options randomization is enabled by default. On previous versions of Python, this option turns on hash randomization, - so that the :meth:`__hash__` values of str, bytes and datetime + so that the :meth:`__hash__` values of str and bytes objects are "salted" with an unpredictable random value. Although they remain constant within an individual Python process, they are not predictable between repeated invocations of Python. @@ -618,7 +618,7 @@ conflict. .. envvar:: PYTHONHASHSEED If this variable is not set or set to ``random``, a random value is used - to seed the hashes of str, bytes and datetime objects. + to seed the hashes of str and bytes objects. If :envvar:`PYTHONHASHSEED` is set to an integer value, it is used as a fixed seed for generating the hash() of the types covered by the hash diff --git a/Misc/python.man b/Misc/python.man index 8d5ad8c..3aa9f1f 100644 --- a/Misc/python.man +++ b/Misc/python.man @@ -431,7 +431,7 @@ If this is set to a comma-separated string it is equivalent to specifying the \fB\-W\fP option for each separate value. .IP PYTHONHASHSEED If this variable is set to "random", a random value is used to seed the hashes -of str, bytes and datetime objects. +of str and bytes objects. If PYTHONHASHSEED is set to an integer value, it is used as a fixed seed for generating the hash() of the types covered by the hash randomization. Its diff --git a/Python/initconfig.c b/Python/initconfig.c index a87d8ae..4965904 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -83,8 +83,8 @@ static const char usage_5[] = "PYTHONFAULTHANDLER: dump the Python traceback on fatal errors.\n"; static const char usage_6[] = "PYTHONHASHSEED: if this variable is set to 'random', a random value is used\n" -" to seed the hashes of str, bytes and datetime objects. It can also be\n" -" set to an integer in the range [0,4294967295] to get hash values with a\n" +" to seed the hashes of str and bytes objects. It can also be set to an\n" +" integer in the range [0,4294967295] to get hash values with a\n" " predictable seed.\n" "PYTHONMALLOC: set the Python memory allocators and/or install debug hooks\n" " on Python memory allocators. Use PYTHONMALLOC=debug to install debug\n" |