Unbundle of all external modules.

Move all libraries in external into subfolders and place a custom
__init__.py into each of them. This way the system installed ones are
tried first, before falling back to the bundled ones.

Now every distribution can properly depend on the upstream library.
(e.g. bundled libraries are not allowed in fedora)

Signed-off-by: Toshio Ernie Kuratomi <[e-mail]>
Signed-off-by: Thomas Spura <[e-mail]>

IPython/external/Itpl/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from Itpl import *
+except ImportError:
+    from _Itpl import *

IPython/external/argparse/__init__.py

@@ -0,0 +1,12 b''
+try:
+    import argparse
+    # Workaround an argparse bug, FIXED in argparse 1.1.0
+    if 'RawTextHelpFormatterArgumentDefaultsHelpFormatter' in argparse.__all__:
+        import itertools
+        argparse.__all__ = list(itertools.chain( [i for i in argparse.__all__
+            if i != 'RawTextHelpFormatterArgumentDefaultsHelpFormatter'],
+            ['RawTextHelpFormatter', 'ArgumentDefaultsHelpFormatter']))
+    argparse.__all__.append('SUPPRESS')
+    from argparse import *
+except ImportError:
+    from _argparse import *

IPython/external/configobj/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from configobj import *
+except ImportError:
+    from _configobj import *

IPython/external/decorator/__init__.py

@@ -0,0 +1,8 b''
+try:
+    from decorator import *
+    from decorator import getinfo, new_wrapper
+    # the following funcion is deprecated so using the python own one
+    from functools import update_wrapper
+except ImportError:
+    from _decorator import *
+    from _decorator import getinfo, update_wrapper, new_wrapper

IPython/external/decorators/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from numpy.testing.decorators import *
+except ImportError:
+    from _decorators.py import *

IPython/external/guid/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from guid import *
+except ImportError:
+    from _guid import *

IPython/external/mglob/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from mglob import *
+except ImportError:
+    from _mglob import *

IPython/external/path/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from path import *
+except ImportError:
+    from _path import *

IPython/external/pretty/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from pretty import *
+except ImportError:
+    from _pretty import *

IPython/external/pyparsing/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from pyparsing import *
+except ImportError:
+    from _pyparsing import *

IPython/external/simplegeneric/__init__.py

@@ -0,0 +1,4 b''
+try:
+    from simplegeneric import *
+except ImportError:
+    from _simplegeneric import *

IPython/external/validate/__init__.py

@@ -0,0 +1,8 b''
+try:
+    import validate
+    if '__docformat__' in validate.__all__ and validate.__version__.split('.') >= ['1', '0', '1']:
+        # __docformat__ was removed in 1.0.1 but 
+        validate.__all__ = [i for i in validate.__all__ if i != '__docformat__']
+    from validate import *
+except ImportError:
+    from _validate import *

setupbase.py

@@ -108,6 +108,18 b' def find_packages():'
     add_package(packages, 'deathrow', tests=True)
     add_package(packages, 'extensions')
     add_package(packages, 'external')
+    add_package(packages, 'external.argparse')
+    add_package(packages, 'external.configobj')
+    add_package(packages, 'external.decorator')
+    add_package(packages, 'external.decorators')
+    add_package(packages, 'external.guid')
+    add_package(packages, 'external.Itpl')
+    add_package(packages, 'external.mglob')
+    add_package(packages, 'external.path')
+    add_package(packages, 'external.pretty')
+    add_package(packages, 'external.pyparsing')
+    add_package(packages, 'external.simplegeneric')
+    add_package(packages, 'external.validate')
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
     add_package(packages, 'frontend.qt.console', tests=True)