[Numpy-svn] r4744 - branches/maskedarray/numpy

[numpy-svn at scipy.org]

Author: stefan
Date: 2008-01-23 05:56:59 -0600 (Wed, 23 Jan 2008)
New Revision: 4744

Modified:
   branches/maskedarray/numpy/__init__.py
Log:
Import add_newdocs earlier, so maskedarray can extend the added
documentation.


Modified: branches/maskedarray/numpy/__init__.py
===================================================================
--- branches/maskedarray/numpy/__init__.py	2008-01-22 19:44:13 UTC (rev 4743)
+++ branches/maskedarray/numpy/__init__.py	2008-01-23 11:56:59 UTC (rev 4744)
@@ -38,6 +38,9 @@
         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 @@
          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 @@
         return NumpyTest().test(*args, **kw)
     test.__doc__ = NumpyTest.test.__doc__
 
-    import add_newdocs
-
-    __all__.extend(['add_newdocs'])
-
     if __doc__ is not None:
         __doc__ += """