summaryrefslogtreecommitdiff
path: root/numpy/core/function_base.py
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2014-02-25 22:26:24 +0100
committerJulian Taylor <juliantaylor108@gmail.com>2014-02-25 22:26:24 +0100
commit8ce3640cb85abfc9a0c7fb55f30957e5224718a4 (patch)
treeb7e156ee4c3715d0a36931f2ab66cb4748ccb922 /numpy/core/function_base.py
parent87a9d5cba6caa7870de7b4dd195368d2fc39d38f (diff)
parentba1e4df00d67e9fceec63a072e641942f98858e6 (diff)
downloadnumpy-8ce3640cb85abfc9a0c7fb55f30957e5224718a4.tar.gz
Merge pull request #4336 from Sankarshan-Mudkavi/fix-issue-3504
Fixed issue 3504
Diffstat (limited to 'numpy/core/function_base.py')
-rw-r--r--numpy/core/function_base.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/function_base.py b/numpy/core/function_base.py
index 3396adf3d..6c0947cbf 100644
--- a/numpy/core/function_base.py
+++ b/numpy/core/function_base.py
@@ -79,6 +79,10 @@ def linspace(start, stop, num=50, endpoint=True, retstep=False, dtype=None):
"""
num = int(num)
+ # Convert float/complex array scalars to float, gh-3504
+ start = start + 0.
+ stop = stop + 0.
+
if dtype is None:
dtype = result_type(start, stop, float(num))