Update Dockerfile to use Python 3 (google#668)

Also ran 2to3 on one file that had some Python2-isms. Fixes google#666
dneto0 · Jun 7, 2019 · f21bd30 · f21bd30
1 parent d0298a3
commit f21bd30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ RUN apk add --update \
     cmake \
     git \
     ninja \
-    python \
+    python3 \
     py-pip \
   && rm -rf /var/cache/apk/*
 

diff --git a/glslc/test/glslc_test_framework.py b/glslc/test/glslc_test_framework.py
@@ -45,8 +45,6 @@ class will be created and serve as a test case in that testsuite.  The test
 be deleted.
 """
 
-from __future__ import print_function
-
 import argparse
 import fnmatch
 import inspect
@@ -305,7 +303,7 @@ def runTest(self):
             run_results = [getattr(self.test, test_method)(test_status)
                            for test_method in get_all_test_methods(
                                self.test.__class__)]
-            success, message = zip(*run_results)
+            success, message = list(zip(*run_results))
             success = all(success)
             message = '\n'.join(message)
         except Exception as e: