diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 11:01:47 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-07 11:01:47 (GMT) |
| commit | 3f930dcd8725078c1655f09ca9bea0889e999fd6 (patch) | |
| tree | 3b4079f251261009de434a8a42904a1438b50b94 /Misc | |
| parent | 397625e43280c1dec19af59c53704e0d95b557d5 (diff) | |
| parent | 9955a373a8ae5a3ac9108afc436199277fdedff7 (diff) | |
| download | cpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.zip cpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.tar.gz cpython-3f930dcd8725078c1655f09ca9bea0889e999fd6.tar.bz2 | |
Merge typo fixes from 3.4 into 3.5
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/HISTORY | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Misc/HISTORY b/Misc/HISTORY index 0462f4e..956d320 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -6751,7 +6751,7 @@ Library - Issue #7895: platform.mac_ver() no longer crashes after calling os.fork(). -- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the +- Issue #9323: Fixed a bug in trace.py that resulted in losing the name of the script being traced. Patch by Eli Bendersky. - Issue #9282: Fixed --listfuncs option of trace.py. Thanks Eli Bendersky for @@ -1717,7 +1717,7 @@ Core and Builtins engine friendly) error messages when "exec" and "print" are used as statements. -- Issue #21642: If the conditional if-else expression, allow an integer written +- Issue #21642: In the conditional if-else expression, allow an integer written with no space between itself and the ``else`` keyword (e.g. ``True if 42else False``) to be valid syntax. |