For this change I used the 3.6.8 version of 2to3 to detect and make the

bulk of the changes.  I also changed all #!/usr/bin/env python to
python3

Signed-off-by: Bill Weide <[email protected]>

Author: Bill Weide

.travis.yml

@@ -37,7 +37,6 @@ python:
     - '3.5'
     - '3.4'
     - '3.3'
-    - '2.7'
 git:
   depth: 1000
 before_install:
@@ -81,7 +80,7 @@ deploy:
   skip_cleanup: true
   on:
     branch: master
-    python: 2.7
+    python: 3.6
 
 after_success:
 env:

pyclient/pymtt.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # Copyright (c) 2018 Cisco Systems, Inc. All rights reserved.
@@ -9,9 +9,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
+
 import os
 import sys
 import configparser

pylib/Stages/BIOS/BIOSMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Firmware/FirmwareMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018  Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Firmware/FooFlash.py

@@ -9,7 +9,7 @@
 #
 
 
-from __future__ import print_function
+
 from FirmwareMTTStage import *
 
 ## @addtogroup Stages

pylib/Stages/LauncherDefaults/LauncherDefaultsMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/MTTDefaults/DefaultMTTDefaults.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 from MTTDefaultsMTTStage import *
 
@@ -110,7 +110,7 @@ def execute(self, log, keyvals, testDef):
 
         # we need to record the results into our options so
         # subsequent sections can capture them
-        keys = cmds.keys()
+        keys = list(cmds.keys())
         for key in keys:
             self.options[key] = (cmds[key], self.options[key][1])
         return

pylib/Stages/MTTDefaults/MTTDefaultsMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/MiddlewareBuild/MiddlewareBuildMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018  Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/MiddlewareGet/MiddlewareGetMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018  Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Profile/CheckProfile.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 from ProfileMTTStage import *
 from ast import literal_eval
@@ -77,7 +77,7 @@ def execute(self, log, keyvals, testDef):
         testDef.parseOptions(log, self.options, keyvals, cmds)
 
         keys = list(cmds.keys())
-        opts = self.options.keys()
+        opts = list(self.options.keys())
 
         for key in keys:
             # diskSpace

pylib/Stages/Profile/DefaultProfile.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 from ProfileMTTStage import *
 

pylib/Stages/Profile/ProfileMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Provisioning/ProvisionMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Provisioning/WWulf3.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from ProvisionMTTStage import *
 import shlex
 

pylib/Stages/Reporter/IUDatabase.py

@@ -9,7 +9,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 import pwd
 import requests
@@ -379,7 +379,7 @@ def _submit_test_run(self, logger, lg, metadata, s, url, testDef, httpauth=None)
             for lgentry in logger.getLog(None):
                 if 'environ' in lgentry:
                     environment.update(lgentry['environ'])
-            data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in environment.items()])
+            data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in list(environment.items())])
 
 
             # BIOS table
@@ -585,7 +585,7 @@ def _submit_test_build(self, logger, lg, metadata, s, url, httpauth=None):
         for lgentry in logger.getLog(None):
             if 'environ' in lgentry:
                 environment.update(lgentry['environ'])
-        data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in environment.items()])
+        data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in list(environment.items())])
 
         try:
             if options['merge_stdout_stderr']:
@@ -784,7 +784,7 @@ def _submit_install(self, logger, lg, metadata, s, url, httpauth=None):
         for lgentry in logger.getLog(None):
             if 'environ' in lgentry:
                 environment.update(lgentry['environ'])
-        data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in environment.items()])
+        data['environment'] = "\n".join([str(k) + "=" + str(v) for k,v in list(environment.items())])
 
         try:
             if options is not None and options['merge_stdout_stderr']:

pylib/Stages/Reporter/JunitXML.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 import sys
 import re

pylib/Stages/Reporter/ReporterMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/Reporter/TextFile.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 import sys
 from ReporterMTTStage import *

pylib/Stages/TestBuild/DefaultTestBuild.py

@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 from TestBuildMTTStage import *
 

pylib/Stages/TestBuild/TestBuildMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/TestGet/TestGetMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/Stages/TestRun/PMIxUnit.py

@@ -10,7 +10,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 import os
 from TestRunMTTStage import *
 import shlex
@@ -81,7 +81,7 @@ def execute(self, log, keyvals, testDef):
 
         # look for all keyvals starting with "test" as these
         # delineate the tests we are to run
-        keys = keyvals.keys()
+        keys = list(keyvals.keys())
         tests = []
         mykeyvals = {}
         for k in keys:

pylib/Stages/TestRun/TestRunMTTStage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
@@ -8,7 +8,7 @@
 # $HEADER$
 #
 
-from __future__ import print_function
+
 from yapsy.IPlugin import IPlugin
 
 ## @addtogroup Stages

pylib/System/LoadClasses.py

@@ -1,4 +1,4 @@
-from __future__ import print_function
+
 from builtins import object
 #!/usr/bin/env python
 #