From: Barry Warsaw <barry@python.org>
Date: Wed, 12 Sep 2012 19:31:38 +0000 (-0400)
Subject: Merge 3.2 fix updates and tests for issue #15906.
X-Git-Tag: v3.3.1rc1~818^2^2~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91;p=python

Merge 3.2 fix updates and tests for issue #15906.
---

d89774e1581ad2ca03ba06876d0fe4f2a2d8ff91
diff --cc Lib/argparse.py
index 66cd70aa31,eb894caebc..f25b1b6610
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@@ -1961,9 -1957,9 +1961,9 @@@ class ArgumentParser(_AttributeHolder, 
                      # twice (which may fail) if the argument was given, but
                      # only if it was defined already in the namespace
                      if (action.default is not None and
-                         isinstance(action, _StoreAction) and
 -                            isinstance(action.default, str) and
 -                            hasattr(namespace, action.dest) and
 -                            action.default is getattr(namespace, action.dest)):
++                        isinstance(action.default, str) and
 +                        hasattr(namespace, action.dest) and
 +                        action.default is getattr(namespace, action.dest)):
                          setattr(namespace, action.dest,
                                  self._get_value(action, action.default))