From 74442835e8dd231601001c6c56717b518c2902e1 Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Wed, 9 Sep 2020 09:03:59 +0200
Subject: [PATCH] remove from __future__ / from builtins

---
 cleanLocalHdd.py           | 3 ---
 comp.py                    | 5 +----
 externalProgramPath.py     | 1 -
 externalProgramPathGui.pyw | 1 -
 launch.py                  | 1 -
 launchGui.pyw              | 3 ---
 parametricJob.py           | 2 --
 postProLoop.py             | 1 -
 postProLoopGui.pyw         | 1 -
 prmClasses.py              | 3 ---
 prmClassesGui.py           | 2 --
 11 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/cleanLocalHdd.py b/cleanLocalHdd.py
index 89180ae..33a8513 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 36d881f..5f17601 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 1bed7a5..d31dc0c 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 39987f0..38260a8 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 88a5329..b73e5aa 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 ba2e9f7..6be6566 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 4dfc0a9..9ebb8b7 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 9b9017e..254cec1 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 536d62d..09ae70f 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 65b950b..46fc38e 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 770a235..3b20bd2 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 ##
-- 
GitLab