diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2009-12-16 09:11:01 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2009-12-16 09:11:01 +0000 |
| commit | b0549eb1517b77da28d44efd7ac39885adaa240d (patch) | |
| tree | b98070e6f2a52664229b23dd9f37780900b6de61 | |
| parent | a50b6a324c73e46aab144d99d30cd955a9ebc636 (diff) | |
| download | numpy-b0549eb1517b77da28d44efd7ac39885adaa240d.tar.gz | |
Take Py3K material out of 1.4.x
| -rw-r--r-- | numpy/core/src/multiarray/arraytypes.c.src | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src index 2cd3cf724..f790f38ee 100644 --- a/numpy/core/src/multiarray/arraytypes.c.src +++ b/numpy/core/src/multiarray/arraytypes.c.src @@ -1074,11 +1074,7 @@ DATETIME_setitem(PyObject *op, char *ov, PyArrayObject *ap) { /* This needs to convert based on type */ temp = ((PyDatetimeScalarObject *)op)->obval; } -#if defined(NPY_PY3K) - else if (PyUString_Check(op)) { -#else - else if (PyUString_Check(op) || PyUnicode_Check(op)) { -#endif + else if (PyString_Check(op) || PyUnicode_Check(op)) { /* FIXME: Converts to DateTime first and therefore does not handle extended notation */ /* import _mx_datetime_parser * res = _mx_datetime_parser(name) |