From 4320b494af35c0d1a7e4abbb6416151dcdabc1f7 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 30 Aug 2018 10:11:24 +0200 Subject: [PATCH] python: fix test_python with python2.7 --- examples/python/coins_grid.py | 1 + examples/python/coins_grid_mip.py | 4 +--- examples/python/killer_sudoku.py | 2 +- examples/python/vendor_scheduling.py | 5 +---- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/python/coins_grid.py b/examples/python/coins_grid.py index 637fbffff0..04ad5ef136 100644 --- a/examples/python/coins_grid.py +++ b/examples/python/coins_grid.py @@ -51,6 +51,7 @@ http://www.hakank.org/google_or_tools/ """ +from __future__ import print_function import sys from ortools.constraint_solver import pywrapcp diff --git a/examples/python/coins_grid_mip.py b/examples/python/coins_grid_mip.py index aa5fddbfbb..ecd2102299 100644 --- a/examples/python/coins_grid_mip.py +++ b/examples/python/coins_grid_mip.py @@ -40,11 +40,10 @@ http://www.hakank.org/google_or_tools/ """ +from __future__ import print_function from ortools.linear_solver import pywraplp - def main(unused_argv): - # Create the solver. # using CBC @@ -97,6 +96,5 @@ def main(unused_argv): print('walltime :', solver.WallTime(), 'ms') # print 'iterations:', solver.Iterations() - if __name__ == '__main__': main('coin grids') diff --git a/examples/python/killer_sudoku.py b/examples/python/killer_sudoku.py index dbb626c490..c60b891a78 100644 --- a/examples/python/killer_sudoku.py +++ b/examples/python/killer_sudoku.py @@ -67,8 +67,8 @@ http://www.hakank.org/google_or_tools/ """ +from __future__ import print_function import sys - from ortools.constraint_solver import pywrapcp # diff --git a/examples/python/vendor_scheduling.py b/examples/python/vendor_scheduling.py index 5a2c6e23ec..40fad033e8 100644 --- a/examples/python/vendor_scheduling.py +++ b/examples/python/vendor_scheduling.py @@ -1,15 +1,13 @@ +from __future__ import print_function from ortools.constraint_solver import pywrapcp - def main(): - # Create the solver. solver = pywrapcp.Solver('Vendors scheduling') # # data # - num_vendors = 9 num_hours = 10 num_work_types = 1 @@ -96,6 +94,5 @@ def main(): print('branches:', solver.Branches()) print('WallTime:', solver.WallTime(), 'ms') - if __name__ == '__main__': main()