summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-10-13 08:29:14 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-10-13 08:29:14 +0000
commitdaf38f394fabdc9cecc8f2aadb3777e546679430 (patch)
tree3472c58fcfbf29af4ddcf552e73bdbf2d61c2060 /numpy
parent7b481cbd0d73630359c4739b0bb2c13a62509e66 (diff)
downloadnumpy-daf38f394fabdc9cecc8f2aadb3777e546679430.tar.gz
ENH: move inspect copy into newly created compat module.
Diffstat (limited to 'numpy')
-rw-r--r--numpy/__init__.py1
-rw-r--r--numpy/compat/__init__.py5
-rw-r--r--numpy/compat/_inspect.py (renamed from numpy/lib/inspect.py)2
-rw-r--r--numpy/compat/setup.py10
-rw-r--r--numpy/compat/setupscons.py11
-rw-r--r--numpy/ma/core.py2
-rw-r--r--numpy/setup.py1
-rw-r--r--numpy/setupscons.py1
8 files changed, 32 insertions, 1 deletions
diff --git a/numpy/__init__.py b/numpy/__init__.py
index 897c14060..4127fa054 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -138,6 +138,7 @@ else:
import core
from core import *
+ import compat
import lib
from lib import *
import linalg
diff --git a/numpy/compat/__init__.py b/numpy/compat/__init__.py
new file mode 100644
index 000000000..0b69dcf5f
--- /dev/null
+++ b/numpy/compat/__init__.py
@@ -0,0 +1,5 @@
+import _inspect
+from _inspect import getargspec, formatargspec
+
+__all__ = []
+__all__.extend(_inspect.__all__)
diff --git a/numpy/lib/inspect.py b/numpy/compat/_inspect.py
index 8ba30ab6a..125b27156 100644
--- a/numpy/lib/inspect.py
+++ b/numpy/compat/_inspect.py
@@ -1,5 +1,7 @@
import types
+__all__ = ['getarspec', 'formatargspec']
+
# ----------------------------------------------------------- type-checking
def ismethod(object):
"""Return true if the object is an instance method.
diff --git a/numpy/compat/setup.py b/numpy/compat/setup.py
new file mode 100644
index 000000000..4e0781085
--- /dev/null
+++ b/numpy/compat/setup.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+def configuration(parent_package='',top_path=None):
+ from numpy.distutils.misc_util import Configuration
+ config = Configuration('compat',parent_package,top_path)
+ return config
+
+if __name__ == '__main__':
+ from numpy.distutils.core import setup
+ setup(configuration=configuration)
diff --git a/numpy/compat/setupscons.py b/numpy/compat/setupscons.py
new file mode 100644
index 000000000..e518245b2
--- /dev/null
+++ b/numpy/compat/setupscons.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+import os.path
+
+def configuration(parent_package='',top_path=None):
+ from numpy.distutils.misc_util import Configuration
+ config = Configuration('compat',parent_package,top_path)
+ return config
+
+if __name__ == '__main__':
+ from numpy.distutils.core import setup
+ setup(configuration=configuration)
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index ce3a00fd8..fe8db4d0e 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -96,7 +96,7 @@ from numpy import array as narray
import numpy.core.umath as umath
import numpy.core.numerictypes as ntypes
-from numpy.lib.inspect import getargspec, formatargspec
+from numpy.compat import getargspec, formatargspec
from numpy import expand_dims as n_expand_dims
import warnings
diff --git a/numpy/setup.py b/numpy/setup.py
index 52580ca41..faa13d9d1 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -15,6 +15,7 @@ def configuration(parent_package='',top_path=None):
config.add_subpackage('random')
config.add_subpackage('ma')
config.add_subpackage('matrixlib')
+ config.add_subpackage('compat')
config.add_subpackage('doc')
config.add_data_dir('doc')
config.add_data_dir('tests')
diff --git a/numpy/setupscons.py b/numpy/setupscons.py
index 45b02ee84..96a90cfe2 100644
--- a/numpy/setupscons.py
+++ b/numpy/setupscons.py
@@ -20,6 +20,7 @@ def configuration(parent_package='', top_path=None):
config.add_subpackage('random')
config.add_subpackage('ma')
config.add_subpackage('matrixlib')
+ config.add_subpackage('compat')
config.add_data_dir('doc')
config.add_data_dir('tests')