Merge pull request #4219 from takluyver/drop-argparse

Drop bundled argparse
ipython · Sep 18, 2013 · 4147ac5 · 4147ac5
2 parents fb2885f + 45e2dad
commit 4147ac5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2,372 deletions.
diff --git a/IPython/config/loader.py b/IPython/config/loader.py
@@ -24,11 +24,11 @@
 #-----------------------------------------------------------------------------
 
 import __builtin__ as builtin_mod
+import argparse
 import os
 import re
 import sys
 
-from IPython.external import argparse
 from IPython.utils.path import filefind, get_ipython_dir
 from IPython.utils import py3compat, warn
 from IPython.utils.encoding import DEFAULT_ENCODING

diff --git a/IPython/core/magic_arguments.py b/IPython/core/magic_arguments.py
@@ -50,9 +50,9 @@ def magic_cool(self, arg):
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
+import argparse
 
 # Our own imports
-from IPython.external import argparse
 from IPython.core.error import UsageError
 from IPython.utils.process import arg_split
 from IPython.utils.text import dedent

diff --git a/IPython/core/tests/test_magic_arguments.py b/IPython/core/tests/test_magic_arguments.py
@@ -6,9 +6,9 @@
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
+import argparse
 from nose.tools import assert_equal
 
-from IPython.external import argparse
 from IPython.core.magic_arguments import (argument, argument_group, kwds,
     magic_arguments, parse_argstring, real_name)
 

diff --git a/IPython/external/argparse/__init__.py b/IPython/external/argparse/__init__.py