From: Andreas Tille <tille@debian.org>
Date: Sat, 21 Dec 2019 12:30:52 +0000 (+0000)
Subject: Use Python3 in build time test suite
X-Git-Tag: archive/raspbian/1.0.6+dfsg-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ca6a5633c201c396d07f93b2da065b825b128f5;p=pbbam.git

Use Python3 in build time test suite

Last-Update: Sun, 04 Aug 2019 09:15:35 +0200


Gbp-Pq: Name python3.patch
---

diff --git a/meson.build b/meson.build
index 7dc4ec2..66b5873 100644
--- a/meson.build
+++ b/meson.build
@@ -83,7 +83,7 @@ subdir('src')
 
 if not meson.is_subproject()
   if get_option('build-tools') or get_option('tests')
-    pbbam_python = find_program('python')
+    pbbam_python = find_program('python3')
 
     if get_option('tests')
       pbbam_clang_formatter = find_program('tools/check-formatting')
diff --git a/tests/scripts/generate_data.py b/tests/scripts/generate_data.py
index 278acb5..61c5584 100755
--- a/tests/scripts/generate_data.py
+++ b/tests/scripts/generate_data.py
@@ -1,7 +1,4 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-from __future__ import unicode_literals
+#!/usr/bin/python3
 
 import os, shutil, sys
 from io import StringIO
@@ -177,9 +174,9 @@ class TestDataGenerator:
         # else silent success
         if self.outputFiles or self.outputSymlinks:
             print('Generating test data in %s ' % self.generatedDataDir)
-            for file, func in self.outputFiles.items():
+            for file, func in list(self.outputFiles.items()):
                 func(file)
-            for link, func in self.outputSymlinks.items():
+            for link, func in list(self.outputSymlinks.items()):
                 func(link)
 
 # script entry point