From 47327e9d3a9ee1d09f0dd6689ec89f6e87a27b32 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 19 Mar 2015 21:16:53 +0100 Subject: [PATCH] keep track of what has moved to py3 --- system/Completer.py | 6 +++++- system/LocalSubstrate.inria.py | 3 ++- system/TestSlice.py | 3 ++- system/config_bignode.py | 3 ++- system/config_default.py | 3 ++- system/config_dual.py | 3 ++- system/config_no_initscript.py | 3 ++- system/config_no_omf.py | 3 ++- system/config_quad.py | 3 ++- system/config_resa.py | 3 ++- system/config_sfadebug.py | 3 ++- system/config_sfavoid.py | 3 ++- system/config_triangle.py | 3 ++- system/tcptest.py | 5 +++++ system/utils.py | 10 ++++++++-- 15 files changed, 42 insertions(+), 15 deletions(-) diff --git a/system/Completer.py b/system/Completer.py index 61ef81d..337e4d9 100755 --- a/system/Completer.py +++ b/system/Completer.py @@ -1,4 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 +# -*- python3 -*- +# Thierry Parmentelat +# Copyright (C) 2015 INRIA + import sys, time from datetime import datetime, timedelta diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py index e102692..2562d67 100755 --- a/system/LocalSubstrate.inria.py +++ b/system/LocalSubstrate.inria.py @@ -1,6 +1,7 @@ #!/usr/bin/python3 -u +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # this is only an example file # the actual file is installed in your testmaster box as /root/LocalTestResources.py diff --git a/system/TestSlice.py b/system/TestSlice.py index c165b39..d5af87e 100644 --- a/system/TestSlice.py +++ b/system/TestSlice.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # import utils import os, os.path diff --git a/system/config_bignode.py b/system/config_bignode.py index 3d15f2f..6ee9043 100644 --- a/system/config_bignode.py +++ b/system/config_bignode.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2012 INRIA +# Copyright (C) 2015 INRIA # # allow one hour for the node to install diff --git a/system/config_default.py b/system/config_default.py index 103fcc7..8fd549a 100644 --- a/system/config_default.py +++ b/system/config_default.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # a configuration module is expected: # (*) to define a config method diff --git a/system/config_dual.py b/system/config_dual.py index 8b6d918..bf538c4 100644 --- a/system/config_dual.py +++ b/system/config_dual.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # just overwrite options.size to be 2 and re-use the default config import config_default diff --git a/system/config_no_initscript.py b/system/config_no_initscript.py index 206d698..ffc0a58 100644 --- a/system/config_no_initscript.py +++ b/system/config_no_initscript.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2012 INRIA +# Copyright (C) 2015 INRIA # # allow one hour for the node to install diff --git a/system/config_no_omf.py b/system/config_no_omf.py index 2cc2b94..8d224ef 100644 --- a/system/config_no_omf.py +++ b/system/config_no_omf.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # remove slice_spec['omf-friendly'] # diff --git a/system/config_quad.py b/system/config_quad.py index 12d6fe2..c3a0922 100644 --- a/system/config_quad.py +++ b/system/config_quad.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # re-use the default config with 3 myplc's and # 3 SFA's for checking antiloop on some decent scale diff --git a/system/config_resa.py b/system/config_resa.py index 27b2c76..93522fb 100644 --- a/system/config_resa.py +++ b/system/config_resa.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # a configuration module is expected: # (*) to define a config method diff --git a/system/config_sfadebug.py b/system/config_sfadebug.py index a9a5a7c..33dd54d 100644 --- a/system/config_sfadebug.py +++ b/system/config_sfadebug.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2012 INRIA +# Copyright (C) 2015 INRIA # # increment SFA_API_LOGLEVEL on all incoming plc_spec's diff --git a/system/config_sfavoid.py b/system/config_sfavoid.py index 90b7fb5..5563db6 100644 --- a/system/config_sfavoid.py +++ b/system/config_sfavoid.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2012 INRIA +# Copyright (C) 2015 INRIA # # this config is defined to run on top of another one # and just sets the generic flavour to 'void' diff --git a/system/config_triangle.py b/system/config_triangle.py index 91c79e4..acce24f 100644 --- a/system/config_triangle.py +++ b/system/config_triangle.py @@ -1,5 +1,6 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # # re-use the default config with 3 myplc's and # 3 SFA's for checking antiloop on some decent scale diff --git a/system/tcptest.py b/system/tcptest.py index e5ff92e..abdc6fb 100755 --- a/system/tcptest.py +++ b/system/tcptest.py @@ -4,6 +4,11 @@ # Copyright (C) 2010 INRIA # +# this is a small and simple standalone utility +# designed to run in slice-space +# we keep this in python2 for now until python3 +# can be taken for granted in sliceimage + from __future__ import print_function import sys diff --git a/system/utils.py b/system/utils.py index b7fd8ef..51205bd 100644 --- a/system/utils.py +++ b/system/utils.py @@ -1,7 +1,13 @@ +# -*- python3 -*- # Thierry Parmentelat -# Copyright (C) 2010 INRIA +# Copyright (C) 2015 INRIA # -import time, os, re, glob, sys +import sys +import time +import os +import re +import glob +import subprocess from pprint import PrettyPrinter options={} -- 2.43.0