From c09a3725bfa74c1c3fae36f4e493b04c32351839 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 13 Mar 2014 11:38:47 -0500
Subject: [PATCH] Minor fixes to Tom's patch

---
 doc/array.rst     | 10 +++++-----
 pyopencl/array.py |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/array.rst b/doc/array.rst
index acaa06b6..e572c900 100644
--- a/doc/array.rst
+++ b/doc/array.rst
@@ -32,13 +32,13 @@ Vector Types
     If you want to construct a pre-initialized vector type you have three new
     functions to choose from:
 
-        * `zeros_type()`
-        * `ones_type()`
-        * `filled_type(fill_value)`
+    * `zeros_type()`
+    * `ones_type()`
+    * `filled_type(fill_value)`
 
-    .. versionadded:: 2013.3
+    .. versionadded:: 2014.1
 
-    .. versionchanged:: 2013.3
+    .. versionchanged:: 2014.1
         The `make_type` functions have a default value (0) for each component.
         Relying on the default values has been deprecated. Either specify all
         components or use one of th new flavors mentioned above for constructing
diff --git a/pyopencl/array.py b/pyopencl/array.py
index f984509d..88770736 100644
--- a/pyopencl/array.py
+++ b/pyopencl/array.py
@@ -28,7 +28,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 """
 
 
-import warnings
 import numpy as np
 import pyopencl.elementwise as elementwise
 import pyopencl as cl
@@ -102,8 +101,9 @@ def _create_vector_types():
 
             def create_array(dtype, count, padded_count, *args, **kwargs):
                 if len(args) < count:
-                    warnings.warn("default values for make_xxx are deprecated;"+
-                            " instead specify all parameters or use"+
+                    from warnings import warn
+                    warn("default values for make_xxx are deprecated;"
+                            " instead specify all parameters or use"
                             " array.vec.zeros_xxx", DeprecationWarning)
                 padded_args = tuple(list(args)+[0]*(padded_count-len(args)))
                 array = eval("array(padded_args, dtype=dtype)",
@@ -114,7 +114,7 @@ def _create_vector_types():
                 return array
 
             setattr(vec, "make_"+name, staticmethod(eval(
-                    "lambda *args, **kwargs: create_array(dtype, %i, %i, "+
+                    "lambda *args, **kwargs: create_array(dtype, %i, %i, "
                     "*args, **kwargs)" % (count, padded_count),
                     dict(create_array=create_array, dtype=dtype))))
             setattr(vec, "filled_"+name, staticmethod(eval(
-- 
GitLab