Merge 3.5

0ae505e7 · Yury Selivanov · 45bc6504 · ef05af59 · 0ae505e7
Kaydet (Commit) 0ae505e7 authored Eyl 09, 2015 tarafından Yury Selivanov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

3.5.rst Doc/whatsnew/3.5.rst +2 -6

No files found.
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -596,12 +596,8 @@ argparse
 * :class:`~argparse.ArgumentParser` now allows to disable
  :ref:`abbreviated usage <prefix-matching>` of long options by setting
  :ref:`allow_abbrev` to ``False``.
-  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson.)
-
-* New *allow_abbrev* parameter for :class:`~argparse.ArgumentParser` to
-  allow long options to be abbreviated if the abbreviation is unambiguous.
-  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and
-  Daniel Eriksson in :issue:`14910`.)
+  (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson
+  in :issue:`14910`.)

 bz2
 ---