summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorJarrod Millman <millman@berkeley.edu>2008-02-08 09:48:31 +0000
committerJarrod Millman <millman@berkeley.edu>2008-02-08 09:48:31 +0000
commitfb3f711f1a1eafb2895a84a80f88814d7fb9a465 (patch)
treeaab6281c88fd6bed7c74df03562c197d934edd83 /numpy/add_newdocs.py
parent2f3f1a8ef977fd04fc40d12ffd05903eb88c8635 (diff)
parent964727a2c475a7e48e262efc52b51345f51f2522 (diff)
downloadnumpy-fb3f711f1a1eafb2895a84a80f88814d7fb9a465.tar.gz
Merge revisions 4721:4771 from the trunk
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index 91c6a6e80..d727df234 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -216,6 +216,7 @@ add_newdoc('numpy.core.multiarray','fromstring',
size is determined by the size of string. If sep is not empty then the
string is interpreted in ASCII mode and converted to the desired number type
using sep as the separator between elements (extra whitespace is ignored).
+ ASCII integer conversions are base-10; octal and hex are not supported.
""")