Merged revisions 86086 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86086 | steven.bethard | 2010-11-01 16:23:12 +0100 (Mon, 01 Nov 2010) | 1 line

  Get argparse.__all__ back up to date (issue 9353)
........
diff --git a/Lib/argparse.py b/Lib/argparse.py
index 654ac48..d5bc16c 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -65,13 +65,20 @@
 __all__ = [
     'ArgumentParser',
     'ArgumentError',
-    'Namespace',
-    'Action',
+    'ArgumentTypeError',
     'FileType',
     'HelpFormatter',
+    'ArgumentDefaultsHelpFormatter',
     'RawDescriptionHelpFormatter',
     'RawTextHelpFormatter',
-    'ArgumentDefaultsHelpFormatter',
+    'Namespace',
+    'Action',
+    'ONE_OR_MORE',
+    'OPTIONAL',
+    'PARSER',
+    'REMAINDER',
+    'SUPPRESS',
+    'ZERO_OR_MORE',
 ]