summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/lib/function_base.py2
-rw-r--r--numpy/version.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 44b7858f5..4789f0d0c 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -511,6 +511,8 @@ def unique(x):
"""
try:
tmp = x.flatten()
+ if tmp.size == 0:
+ return tmp
tmp.sort()
idx = concatenate(([True],tmp[1:]!=tmp[:-1]))
return tmp[idx]
diff --git a/numpy/version.py b/numpy/version.py
index fc64ee94b..a0c7a18b3 100644
--- a/numpy/version.py
+++ b/numpy/version.py
@@ -1,4 +1,4 @@
-version='1.1'
+version='0.9.9'
import os
svn_version_file = os.path.join(os.path.dirname(__file__),