From af82243d39616cbd0bffbc6a4e3402535aac741c 2011-03-24 19:11:51
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-03-24 19:11:51
Subject: [PATCH] Fix DeprecationWarning with system-wide argparse.

---

diff --git a/IPython/config/loader.py b/IPython/config/loader.py
index 33f7deb..aba060f 100644
--- a/IPython/config/loader.py
+++ b/IPython/config/loader.py
@@ -325,6 +325,7 @@ class ArgParseConfigLoader(CommandLineConfigLoader):
             argv = sys.argv[1:]
         self.argv = argv
         self.parser_args = parser_args
+        self.version = parser_kw.pop("version", None)
         kwargs = dict(argument_default=argparse.SUPPRESS)
         kwargs.update(parser_kw)
         self.parser_kw = kwargs
diff --git a/IPython/core/application.py b/IPython/core/application.py
index 5ad9432..b0f085f 100644
--- a/IPython/core/application.py
+++ b/IPython/core/application.py
@@ -69,10 +69,16 @@ class BaseAppConfigLoader(ArgParseConfigLoader):
             dest="Global.log_level",type=int,
             help='Set the log level (0,10,20,30,40,50).  Default is 30.',
             metavar='Global.log_level')
+            
+    def _add_version(self, parser):
+        """Add the --version option to the parser."""
+        parser.add_argument('--version', action="version",
+                                                version=self.version)
 
     def _add_arguments(self):
         self._add_ipython_dir(self.parser)
         self._add_log_level(self.parser)
+        self._add_version(self.parser)
 
 
 class Application(object):