Switch to python 3

cmake/Python.cmake

@@ -2,14 +2,14 @@
 # Python Setup
 ##############################################################################
 
-# Pin down python 2.7
-find_package(PythonLibs 2.7 REQUIRED)
-find_package(PythonInterp 2.7 REQUIRED)
+# Pin down python 3.6
+find_package(PythonLibs 3.6 REQUIRED)
+find_package(PythonInterp 3.6 REQUIRED)
 
 # Unfortunately no easy way to get site-packages / dist-packages
 set(PYTHON_INSTALL_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
 
 if(NOT PYBIND11_PYTHON_VERSION)
-  set(PYBIND11_PYTHON_VERSION "2.7" CACHE STRING "Python version to use for compiling modules")
+  set(PYBIND11_PYTHON_VERSION "3.6" CACHE STRING "Python version to use for compiling modules")
 endif()
 find_package(pybind11 REQUIRED)

python/delphyne/cmdline.py

@@ -11,8 +11,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import delphyne.console as console
 
 ##############################################################################

python/delphyne/console.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -33,8 +33,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os
 import sys
 

python/delphyne/demos/city.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #
@@ -10,8 +10,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os.path
 import random
 

python/delphyne/demos/crash.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #
@@ -9,8 +9,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import math
 import numpy as np
 

python/delphyne/demos/dragway.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -9,8 +9,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import delphyne.maliput as maliput
 import delphyne.simulation as simulation
 import delphyne.utilities as utilities

python/delphyne/demos/gazoo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -10,8 +10,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os.path
 
 import delphyne.maliput as maliput

python/delphyne/demos/helpers.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -12,8 +12,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import argparse
 
 import delphyne.cmdline as cmdline

python/delphyne/demos/keyop.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -10,7 +10,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
 from select import select
 
 import atexit

python/delphyne/demos/mobil_perf.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #
@@ -9,8 +9,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import math
 
 import delphyne.maliput as maliput

python/delphyne/demos/realtime.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -11,8 +11,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os
 import sys
 

python/delphyne/demos/roads.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -9,8 +9,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os
 import sys
 
@@ -112,7 +110,7 @@ def main():
                     file_path=args.filename
                 )
             )
-        except RuntimeError, error:
+        except RuntimeError as error:
             print("There was an error trying to load the road network:")
             print(str(error))
             print("Exiting the simulation")

python/delphyne/demos/scriptlets.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -16,8 +16,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os.path
 
 import random

python/delphyne/launcher.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -62,12 +62,18 @@ def launch(self, command, label=None, cwd=None, environ=None):
                 stdin=self.devnull,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
+                universal_newlines=True,  # otherwise the terminal control
+                                          # characters (e.g. for colors) are
+                                          # escaped.
                 env=command_env)
         else:
             process = subprocess.Popen(
                 command,
                 stdin=self.devnull,
                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                universal_newlines=True,  # otherwise the terminal control
+                                          # characters (e.g. for colors) are
+                                          # escaped.
                 cwd=cwd,
                 env=command_env)
         flags = fcntl.fcntl(process.stdout, fcntl.F_GETFL)
@@ -78,15 +84,15 @@ def launch(self, command, label=None, cwd=None, environ=None):
         time.sleep(0.05)
         self._poll()
         if self.returncode is not None:
-            print process.stdout.read(),
-            print "[%s] %s failed to launch" % (self.name, label)
+            print(process.stdout.read())
+            print("[%s] %s failed to launch" % (self.name, label))
             sys.exit(self.returncode or 1)
 
     def _poll(self):
         for child in self.children:
             ret = child.process.poll()
             if ret is not None:
-                print "[%s] %s exited %d" % (self.name, child.label, ret)
+                print("[%s] %s exited %d" % (self.name, child.label, ret))
                 if self.returncode is None:
                     self.returncode = ret
         return self.returncode
@@ -102,8 +108,8 @@ def _wait(self, duration):
             now = time.time()
             elapsed = now - start
             if elapsed > duration:
-                print "[%s] %s exited via duration elapsed" % (
-                    self.name, self.name)
+                print("[%s] %s exited via duration elapsed" %
+                      (self.name, self.name))
                 self.returncode = 0
                 self.done = True
 
@@ -117,8 +123,8 @@ def _wait(self, duration):
                 if not lines:
                     continue
 
-                print '\n'.join(
-                    ["[%s] %s" % (child.label, line) for line in lines])
+                print('\n'.join(["[%s] %s" % (child.label, line)
+                                 for line in lines]))
                 sys.stdout.flush()
 
     def wait(self, duration):
@@ -132,8 +138,8 @@ def wait(self, duration):
             self._wait(duration)
         except KeyboardInterrupt:
             # This is considered success; we ran until the user stopped us.
-            print "[%s] %s exited via keyboard interrupt" % (
-                self.name, self.name)
+            print("[%s] %s exited via keyboard interrupt" %
+                  (self.name, self.name))
             self.returncode = 0
         assert self.returncode is not None
 

python/delphyne/toolkit/replay.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #
@@ -11,11 +11,8 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import argparse
 import contextlib
-import itertools
 import os
 import shutil
 import sys
@@ -123,7 +120,7 @@ def main():
             for relative_path in os.listdir(root_path)
         ]
         found_files = [path for path in found_paths if os.path.isfile(path)]
-        args.log_file = next(itertools.ifilter(is_log_file, sorted(
+        args.log_file = next(filter(is_log_file, sorted(
             found_files, key=os.path.getmtime, reverse=True
         )), None)
 

python/delphyne/utilities.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #
@@ -12,8 +12,6 @@
 # Imports
 ##############################################################################
 
-from __future__ import print_function
-
 import os
 import sys
 import time

python/examples/delphyne-city

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #

python/examples/delphyne-crash

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #

python/examples/delphyne-dragway

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/examples/delphyne-gazoo

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/examples/delphyne-keyop

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/examples/delphyne-mobil-perf

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #

python/examples/delphyne-realtime

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/examples/delphyne-roads

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/examples/delphyne-scriptlets

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #

python/scripts/delphyne-replay

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2018 Toyota Research Institute
 #

test/regression/python/simulation_runner_py_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 #
 # Copyright 2017 Toyota Research Institute
 #