diff --git a/cleanLocalHdd.py b/cleanLocalHdd.py index 89180ae6089cb7e3aa1ac49beb6912f64e155689..33a8513546fa85b455c45689577230020eb4647f 100755 --- a/cleanLocalHdd.py +++ b/cleanLocalHdd.py @@ -4,9 +4,6 @@ # Script cleanLocalHdd.py : listing de l'utilisation et nettoyage des disques locaux sur le cluster # -from __future__ import print_function -from builtins import input -from builtins import range import os, sys, subprocess def listByUser(user, nodesList): diff --git a/comp.py b/comp.py index 36d881fcc7d5ccaae5fd2f16acfb41693b65df67..5f176011c31b6a83fea79f072ae80232c031d158 100755 --- a/comp.py +++ b/comp.py @@ -5,8 +5,6 @@ # - compilation de Metafor # - lancement automatique de la batterie -from __future__ import print_function -from builtins import object from parametricJob import * import re @@ -209,8 +207,7 @@ class CompJob(ParametricJob): # which python? out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c', - 'from __future__ import print_function; import sys; print(sys.version_info.major)']) - try: + ' try: pyver = int(out) except: self.error('unable to get python version number') diff --git a/externalProgramPath.py b/externalProgramPath.py index 1bed7a5b2a4cd168f714857690f8ab398815e34b..d31dc0c3543bce5abf8490c51ff46f5ff6b5b36a 100755 --- a/externalProgramPath.py +++ b/externalProgramPath.py @@ -3,7 +3,6 @@ # # Define external program paths according to local configuration -from __future__ import print_function from prmClasses import * import os, os.path, distutils.spawn diff --git a/externalProgramPathGui.pyw b/externalProgramPathGui.pyw index 39987f0fce3724e29f1c1ab81d85db7bd206ba7d..38260a8f20e20ea8a98d43b89dc319ef151edc51 100755 --- a/externalProgramPathGui.pyw +++ b/externalProgramPathGui.pyw @@ -4,7 +4,6 @@ # Gui to configure externals program path according to local configuration ## Qt ## -from __future__ import print_function try: from PySide2.QtCore import * from PySide2.QtGui import * diff --git a/launch.py b/launch.py index 88a5329925f3936494ca7fde9781051f0271c40c..b73e5aa02193a4289e0cfe1d9ea7835fd6ed2917 100755 --- a/launch.py +++ b/launch.py @@ -3,7 +3,6 @@ # # Script "launch.py": aide au lancement d'un job Metafor -from __future__ import print_function import sys, os, os.path, subprocess import shutil, socket, platform, glob, fnmatch, re import datetime, tarfile, signal diff --git a/launchGui.pyw b/launchGui.pyw index ba2e9f7e5adfb7dacec4bb888c560ec4aecf8176..6be6566351b920bccb74c46e0caf562b5e9d178e 100755 --- a/launchGui.pyw +++ b/launchGui.pyw @@ -11,9 +11,6 @@ # unicodestr.encode('ascii','ignore') # -from __future__ import print_function -from builtins import map -from builtins import str import os,sys from prmClassesGui import * from launch import * diff --git a/parametricJob.py b/parametricJob.py index 4dfc0a9eeb7c61f85e451fdc67f1dad0b0fee0ed..9ebb8b7ca1451af9044b719095867ad212115251 100644 --- a/parametricJob.py +++ b/parametricJob.py @@ -1,10 +1,8 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function from future import standard_library standard_library.install_aliases() -from builtins import input import sys, os, os.path, shutil, socket, platform, glob, fnmatch import datetime, tarfile, subprocess, string from prmClasses import * diff --git a/postProLoop.py b/postProLoop.py index 9b9017ec097f7d1b0b9f528f0b59b8ac013b2fa7..254cec189ae8db3039063d4549339aa512a2a701 100755 --- a/postProLoop.py +++ b/postProLoop.py @@ -5,7 +5,6 @@ # # Define externals program path according to local configuration # -from __future__ import print_function from prmClasses import * import os, os.path, distutils.spawn, time, sys, re, glob import imp diff --git a/postProLoopGui.pyw b/postProLoopGui.pyw index 536d62d8fd869aa02bdb9148b509daa7ace9a619..09ae70f83d1d7acb5435e21d1ef14767a182c7a3 100755 --- a/postProLoopGui.pyw +++ b/postProLoopGui.pyw @@ -7,7 +7,6 @@ # ## Qt ## -from __future__ import print_function try: from PySide2.QtCore import * from PySide2.QtGui import * diff --git a/prmClasses.py b/prmClasses.py index 65b950b36462440632a1167ff4d55eadf493848b..46fc38e1598becc03c23c49660da883f0505a901 100644 --- a/prmClasses.py +++ b/prmClasses.py @@ -4,9 +4,6 @@ # Classes de gestion des parametres -from __future__ import print_function -from builtins import input -from builtins import object import sys, os, os.path, shutil, socket, platform, glob, fnmatch import datetime, tarfile, subprocess diff --git a/prmClassesGui.py b/prmClassesGui.py index 770a2351fda2fe54bc5616070c41d1faf705ab57..3b20bd27509777a2e67127db1ece181439c78ebf 100644 --- a/prmClassesGui.py +++ b/prmClassesGui.py @@ -5,8 +5,6 @@ # # Classe d'interface PyQt des prmClasses -from __future__ import print_function -from builtins import object import os,sys ## Qt ##