diff options
| -rw-r--r-- | TEST_COMMIT | 2 | ||||
| -rw-r--r-- | scipy/base/_internal.py | 3 | ||||
| -rw-r--r-- | scipy/base/oldnumeric.py | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/TEST_COMMIT b/TEST_COMMIT index 05d266197..462e08535 100644 --- a/TEST_COMMIT +++ b/TEST_COMMIT @@ -7,3 +7,5 @@ cookedm: no swalton: no eric: no charris: no +fonnesbeck: no +afayolle: no diff --git a/scipy/base/_internal.py b/scipy/base/_internal.py index c9b6c6b3d..bc3f18012 100644 --- a/scipy/base/_internal.py +++ b/scipy/base/_internal.py @@ -45,6 +45,9 @@ class flagsobj(dict): if (key == 'FNC'): return (self._flagnum & _fnum == _fnum) and not \ (self._flagnum & _cnum == _cnum) + if (key == 'FORC'): + return (self._flagnum & _fnum == _fnum) or \ + (self._flagnum & _cnum == _cnum) if (key == 'BEHAVED'): num = _anum + _nnum + _wnum return self._flagnum & num == num diff --git a/scipy/base/oldnumeric.py b/scipy/base/oldnumeric.py index 4eb9c9f42..008cefb00 100644 --- a/scipy/base/oldnumeric.py +++ b/scipy/base/oldnumeric.py @@ -28,9 +28,9 @@ UnsignedInt16 = nt.uint16 UnsignedInt32 = nt.uint32 UnsignedInt = nt.uint -typecodes = {'Character':'S1', 'Integer':'bhilqp', 'UnsignedInteger':'BHILQP', +typecodes = {'Character':'S1', 'Integer':'bhilq', 'UnsignedInteger':'BHILQ', 'Float':'fdg', 'Complex':'FDG', 'AllInteger':'bBhHiIlLqQ', - 'AllFloat':'fdgFDG', 'All':'?bhilqpBHILQPfdgFDGSVUO'} + 'AllFloat':'fdgFDG', 'All':'?bhilqBHILQfdgFDGSVUO'} def sarray(a, dtype=None, copy=0): |