[beignet] 02/04: Make tests work with Python 3 and switch back to it

[Rebecca Palmer]

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

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit d5b400b16cea9570645714fc28edbd6ed1bb70e2
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Sep 25 22:05:45 2016 +0100

    Make tests work with Python 3 and switch back to it
---
 debian/changelog                     |  1 +
 debian/control                       |  2 +-
 debian/patches/series                |  1 +
 debian/patches/support-python3.patch | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f95ffae..cd587f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 beignet (1.2.0-2) UNRELEASED; urgency=medium
 
   * Fix FTBFS on kfreebsd-*.
+  * Make tests work with Python 3 and switch back to it.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 25 Sep 2016 21:58:07 +0100
 
diff --git a/debian/control b/debian/control
index f13e32e..ae8a383 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  pkg-config,
- python,
+ python3,
  libdrm-dev,
  libxext-dev,
  libxfixes-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 6a4ee9a..827d2df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ Enable-test-debug.patch
 find-python35.patch
 docs-broken-links.patch
 cl_accelerator_intel.patch
+support-python3.patch
diff --git a/debian/patches/support-python3.patch b/debian/patches/support-python3.patch
new file mode 100644
index 0000000..0b88fb2
--- /dev/null
+++ b/debian/patches/support-python3.patch
@@ -0,0 +1,16 @@
+Description: Allow building tests with Python 3 (no string.atoi)
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Forwarded: https://lists.freedesktop.org/archives/beignet/2016-September/008007.html
+
+--- beignet-1.2.0.orig/utests/utest_generator.py
++++ beignet-1.2.0/utests/utest_generator.py
+@@ -248,7 +248,7 @@ which can print more values and informat
+   def argvector(self,paraN,index):
+     vector=re.findall(r"[0-9]+",self.inputtype[paraN][index])
+     if vector:
+-      vector=string.atoi(vector[0])
++      vector=int(vector[0])
+     else:
+       vector=1
+     return vector

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git