[pytables] 03/04: Drop 0005-Fix-setitem-return-value.patch (applied upstream)

Antonio Valentino a_valentino-guest at moszumanska.debian.org
Sat Oct 3 17:28:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository pytables.

commit 322901691793efd7f0937c548a36a13b4f47226f
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Oct 3 16:16:35 2015 +0000

    Drop 0005-Fix-setitem-return-value.patch (applied upstream)
---
 debian/changelog                                   |  2 ++
 debian/patches/0005-Fix-setitem-return-value.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 270ac3f..5edee7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pytables (3.2.2-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #800466)
+  * debian/patches:
+    - drop 0005-Fix-setitem-return-value.patch (applied upstream)
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 03 Oct 2015 15:59:23 +0000
 
diff --git a/debian/patches/0005-Fix-setitem-return-value.patch b/debian/patches/0005-Fix-setitem-return-value.patch
deleted file mode 100644
index 5d73cc0..0000000
--- a/debian/patches/0005-Fix-setitem-return-value.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Clear the exception set by PyArray_SETITEM() before raising a
- TypeError.  Without this, the test suite will raise a SystemError.
-Author: Barry Warsaw <barry at ubuntu.com>
-Bug: https://github.com/PyTables/PyTables/issues/486
-
---- a/tables/tableextension.pyx
-+++ b/tables/tableextension.pyx
-@@ -40,7 +40,7 @@
-
- # numpy functions & objects
- from hdf5extension cimport Leaf
--from cpython cimport PY_MAJOR_VERSION
-+from cpython cimport PY_MAJOR_VERSION, PyErr_Clear
- from libc.stdio cimport snprintf
- from libc.stdlib cimport malloc, free
- from libc.string cimport memcpy, strdup, strcmp, strlen
-@@ -1596,6 +1596,7 @@
-       if field.ndim == 1:
-         ret = PyArray_SETITEM(field, field.data + offset * self._stride, value)
-         if ret < 0:
-+          PyErr_Clear()
-           raise TypeError
-       ##### End of optimization for scalar values
-       else:
diff --git a/debian/patches/series b/debian/patches/series
index 2c304df..5900800 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 0002-Use-system-compression-libs.patch
 0003-Never-use-the-msse2-flag-explicitly.patch
 0004-Do-not-fetch-icons-for-external-web-sites.patch
-0005-Fix-setitem-return-value.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git



More information about the debian-science-commits mailing list