Kaydet (Commit) 2dceb359 authored tarafından Barry Warsaw's avatar Barry Warsaw

Update merge from 2.7: s/basetring/str

üst eaae1b76
...@@ -1957,7 +1957,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): ...@@ -1957,7 +1957,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
# twice (which may fail) if the argument was given, but # twice (which may fail) if the argument was given, but
# only if it was defined already in the namespace # only if it was defined already in the namespace
if (action.default is not None and if (action.default is not None and
isinstance(action.default, basestring) and isinstance(action.default, str) and
hasattr(namespace, action.dest) and hasattr(namespace, action.dest) and
action.default is getattr(namespace, action.dest)): action.default is getattr(namespace, action.dest)):
setattr(namespace, action.dest, setattr(namespace, action.dest,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment