merged from HEAD

dabrahams · dabrahams · commit 8553c109c7e4 · 2006-09-29T22:27:57.000Z
[SVN r35429]
diff --git a/src/numeric.cpp b/src/numeric.cpp
@@ -205,7 +205,7 @@ namespace aux
         , bool savespace
         , object typecode)
   {
-      return attr("array")(buffer, type, shape, copy, savespace, typecode);
+      return attr("factory")(buffer, type, shape, copy, savespace, typecode);
   }
 
   object array_base::getflat() const
diff --git a/test/numpy.py b/test/numpy.py
@@ -87,11 +87,11 @@ def _numarray_tests():
     >>> check(y);
     >>> check(y.type());
 
-    >>> check(y.array((1.2, 3.4)));
-    >>> check(y.array((1.2, 3.4), "Double"));
-    >>> check(y.array((1.2, 3.4), "Double", (1,2,1)));
-    >>> check(y.array((1.2, 3.4), "Double", (2,1,1), false));
-    >>> check(y.array((1.2, 3.4), "Double", (2,), true, true));
+    >>> check(y.factory((1.2, 3.4)));
+    >>> check(y.factory((1.2, 3.4), "Double"));
+    >>> check(y.factory((1.2, 3.4), "Double", (1,2,1)));
+    >>> check(y.factory((1.2, 3.4), "Double", (2,1,1), false));
+    >>> check(y.factory((1.2, 3.4), "Double", (2,), true, true));
     
     >>> p.results
     []

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ namespace aux`
`205`	`205`	`, bool savespace`
`206`	`206`	`, object typecode)`
`207`	`207`	`{`
`208`		`- return attr("array")(buffer, type, shape, copy, savespace, typecode);`
	`208`	`+ return attr("factory")(buffer, type, shape, copy, savespace, typecode);`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`object array_base::getflat() const`