From d40d6ef07c51fb695bc70d22ef9c82de8234765c Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Wed, 23 Jan 2008 11:56:59 +0000
Subject: Import add_newdocs earlier, so maskedarray can extend the added
 documentation.

---
 numpy/__init__.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'numpy/__init__.py')

diff --git a/numpy/__init__.py b/numpy/__init__.py
index 8623735a7..3b611f4da 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -38,6 +38,9 @@ else:
         loader = PackageLoader(infunc=True)
         return loader(*packages, **options)
 
+    import add_newdocs
+    __all__ = ['add_newdocs',]
+
     pkgload.__doc__ = PackageLoader.__call__.__doc__
     import testing
     from testing import ScipyTest, NumpyTest
@@ -57,11 +60,11 @@ else:
          object, unicode, str
     from core import round, abs, max, min
 
-    __all__ = ['__version__', 'pkgload', 'PackageLoader',
-               'ScipyTest', 'NumpyTest', 'show_config']
-    __all__ += core.__all__
-    __all__ += lib.__all__
-    __all__ += ['linalg', 'fft', 'random', 'ctypeslib']
+    __all__.extend(['__version__', 'pkgload', 'PackageLoader',
+               'ScipyTest', 'NumpyTest', 'show_config'])
+    __all__.extend(core.__all__)
+    __all__.extend(lib.__all__)
+    __all__.extend(['linalg', 'fft', 'random', 'ctypeslib'])
 
     if __doc__ is not None:
         __doc__ += """
@@ -98,10 +101,6 @@ testing --> NumpyTest
         return NumpyTest().test(*args, **kw)
     test.__doc__ = NumpyTest.test.__doc__
 
-    import add_newdocs
-
-    __all__.extend(['add_newdocs'])
-
     if __doc__ is not None:
         __doc__ += """
 
-- 
cgit v1.2.1