[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/7e3ec8ad3f20
changeset:   93145:7e3ec8ad3f20
parent:      93143:e906e23931fa
parent:      93144:550de59a4c6d
user:        Georg Brandl <georg at python.org>
date:        Mon Oct 20 08:36:09 2014 +0200
summary:
  merge with 3.4

files:
  Lib/argparse.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -490,7 +490,7 @@
         action_width = help_position - self._current_indent - 2
         action_header = self._format_action_invocation(action)
 
-        # ho nelp; start on same line and add a final newline
+        # no help; start on same line and add a final newline
         if not action.help:
             tup = self._current_indent, '', action_header
             action_header = '%*s%s\n' % tup

-- 
Repository URL: https://hg.python.org/cpython