summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-05-27 15:44:07 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-05-27 15:44:07 -0700
commitb98eefccbf0b6f60414f87ce135e9bbd2bea5a3a (patch)
tree08beefc2fe3db44848ab9551479e9778c91a7e53 /numpy/lib
parent6bc59a0399aede915de750c2521eaaf32077d0b2 (diff)
parent747520869f24372304a7ceacc27d9834c0e47827 (diff)
downloadnumpy-b98eefccbf0b6f60414f87ce135e9bbd2bea5a3a.tar.gz
Merge pull request #3366 from dnmiller/doc-fix
DOC: Correcting docstring for asscalar
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/type_check.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index cb9b6ee49..da9e13847 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -451,7 +451,8 @@ def asscalar(a):
Returns
-------
out : scalar
- Scalar representation of `a`. The input data type is preserved.
+ Scalar representation of `a`. The output data type is the same type
+ returned by the input's `item` method.
Examples
--------