diff options
| author | cookedm <cookedm@localhost> | 2006-02-21 23:09:12 +0000 |
|---|---|---|
| committer | cookedm <cookedm@localhost> | 2006-02-21 23:09:12 +0000 |
| commit | ede85cec1879d0d18a797749ccf7fc1853a2146e (patch) | |
| tree | 450ae37baa762c4357125e428d185aedb8105ac9 /numpy/lib/scimath.py | |
| parent | bb23ed753f0548e79bf3371cc7c6a3ec81187bb4 (diff) | |
| parent | 0aa85cabe66a188a409e51e04186a050ba6d2d79 (diff) | |
| download | numpy-ede85cec1879d0d18a797749ccf7fc1853a2146e.tar.gz | |
Merge trunk (r2124:2142) to power optimization branch
Diffstat (limited to 'numpy/lib/scimath.py')
| -rw-r--r-- | numpy/lib/scimath.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py index 1e06946b6..1875647aa 100644 --- a/numpy/lib/scimath.py +++ b/numpy/lib/scimath.py @@ -27,7 +27,7 @@ def _fix_real_lt_zero(x): x = asarray(x) if any(isreal(x) & (x<0)): x = _tocomplex(x) - return asscalar(x) + return x def _fix_real_abs_gt_1(x): x = asarray(x) |