Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added two to TEST_COMMIT

  • Loading branch information...
commit 0267fe6d70ea112813bb1b615b98d02e28021c7f 1 parent 7831378
Travis Oliphant authored
View
2  TEST_COMMIT
@@ -7,3 +7,5 @@ cookedm: no
swalton: no
eric: no
charris: no
+fonnesbeck: no
+afayolle: no
View
3  scipy/base/_internal.py
@@ -45,6 +45,9 @@ def __getitem__(self, key):
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
View
4 scipy/base/oldnumeric.py
@@ -28,9 +28,9 @@
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):

0 comments on commit 0267fe6

Please sign in to comment.
Something went wrong with that request. Please try again.