From e53ea1b3a65ec9c5609ccbeda2b03fb309c24005 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 21 Aug 2012 11:46:47 -0400
Subject: [PATCH] Don't inherit device memory error from Python MemoryError.
py.test seems to take the latter way too seriously, and the meaning
is slightly off anyway.
---
src/wrapper/wrap_constants.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/wrapper/wrap_constants.cpp b/src/wrapper/wrap_constants.cpp
index 5f818bf6..d6e2246c 100644
--- a/src/wrapper/wrap_constants.cpp
+++ b/src/wrapper/wrap_constants.cpp
@@ -99,10 +99,7 @@ void pyopencl_expose_constants()
{
DECLARE_EXC(Error, NULL);
- py::tuple memerr_bases = py::make_tuple(
- CLError,
- py::handle<>(py::borrowed(PyExc_MemoryError)));
- DECLARE_EXC(MemoryError, memerr_bases.ptr());
+ DECLARE_EXC(MemoryError, CLError.get());
DECLARE_EXC(LogicError, CLError.get());
DECLARE_EXC(RuntimeError, CLError.get());
--
GitLab