diff options
| -rw-r--r-- | numpy/core/numerictypes.py | 11 | ||||
| -rw-r--r-- | numpy/core/tests/test_regression.py | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/numpy/core/numerictypes.py b/numpy/core/numerictypes.py index f1152cb74..017898cf0 100644 --- a/numpy/core/numerictypes.py +++ b/numpy/core/numerictypes.py @@ -33,17 +33,10 @@ Exported symbols include: int_, uint, longlong, ulonglong, - single, csingle, float_, complex_, longfloat, clongfloat, - - datetime_ - timedelta_, (this inherits from from signedinteger, as it is - a signed integer with an associated time unit) - - As part of the type-hierarchy: xx -- is bit-width generic @@ -405,9 +398,7 @@ def _set_up_aliases(): ('longcomplex', 'clongdouble'), ('bool_', 'bool'), ('unicode_', 'unicode'), - ('object_', 'object'), - ('timedelta_', 'timedelta'), - ('datetime_', 'datetime')] + ('object_', 'object')] if sys.version_info[0] >= 3: type_pairs.extend([('bytes_', 'string'), ('str_', 'unicode'), diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py index 1c43189bb..312a7475a 100644 --- a/numpy/core/tests/test_regression.py +++ b/numpy/core/tests/test_regression.py @@ -1306,7 +1306,7 @@ class TestRegression(TestCase): def test_ticket_1539(self): dtypes = [x for x in np.typeDict.values() if (issubclass(x, np.number) - and not issubclass(x, np.timedelta_))] + and not issubclass(x, np.timedelta64))] a = np.array([], dtypes[0]) failures = [] for x in dtypes: |