diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-02-17 00:45:42 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-02-17 00:45:42 (GMT) |
| commit | 77c041ba64f87ac021c2a7a9314d9a3a1145057f (patch) | |
| tree | e0f19e9fa4974fe541862907eae85fe1c3b5ba0a /Misc | |
| parent | 43036a66c37075534febdc4a4caaae8a364a9942 (diff) | |
| parent | 54237f9feaefd209c2aaa5b4003810e69f6714f3 (diff) | |
| download | cpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.zip cpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.tar.gz cpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.tar.bz2 | |
merge 3.4 (#21548)
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -513,6 +513,7 @@ Eric Groo Dag Gruneau Filip Gruszczyński Thomas Guettler +Yuyang Guo Anuj Gupta Michael Guravage Lars Gustäbel @@ -13,6 +13,9 @@ Core and Builtins Library ------- +- Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty + docstrings. + - Issue #22885: Fixed arbitrary code execution vulnerability in the dbm.dumb module. Original patch by Claudiu Popa. |