Merge pull request #35 from ISISComputingGroup/Ticket4896_convert_to_python_3

Ticket 4896: Convert to Python 3

Author: Aaron James Long

Jenkinsfile

@@ -53,7 +53,7 @@ pipeline {
                     goto ERROR
             )
 
-            C:/Instrument/Apps/Python/python.exe run_tests.py || echo "running tests failed."
+            C:/Instrument/Apps/Python3/python.exe run_tests.py || echo "running tests failed."
             """
       }
     }

block.py

@@ -17,10 +17,11 @@
 Classes for Blocks
 """
 
+from builtins import object
 from block_utils import format_block_value
 
 
-class Block:
+class Block(object):
     """
     Class holding Block details. Used for displaying in dataweb
     """

block_utils.py

@@ -86,7 +86,7 @@ def format_block_value(val, precision):
     assert small_number_threshold < big_number_threshold
 
     # No precision specified = do not format.
-    if precision is None or precision < 0:
+    if precision is None or not isinstance(precision, int) or precision < 0:
         return u"{}".format(val)
     try:
         float_val = float(val)

external_webpage/data_source_reader.py

@@ -101,9 +101,9 @@ def read_config(self):
         """
 
         # read config
-        page = requests.get('http://%s:%s/' % (self._host, PORT_CONFIG))
-        corrected_page = page.content\
-            .replace("'", '"')\
+        page = requests.get('http://{}:{}/'.format(self._host, PORT_CONFIG))
+        content = page.content.decode("utf-8")
+        corrected_page = content.replace("'", '"')\
             .replace("None", "null")\
             .replace("True", "true")\
             .replace("False", "false")

external_webpage/instrument_information_collator.py

@@ -17,6 +17,8 @@
 Classes getting external resources from an instrument and formating them for the info page.
 """
 
+from builtins import str
+from builtins import object
 import logging
 
 from block_utils import (format_blocks, set_rc_values_for_blocks)
@@ -87,7 +89,7 @@ def block_is_visible(self, block_name):
             return True
 
 
-class InstrumentInformationCollator:
+class InstrumentInformationCollator(object):
     """
     Collect instrument information and summarise as a dictionary.
     """

external_webpage/instrument_scapper.py

@@ -1,3 +1,5 @@
+from builtins import str
+from builtins import range
 import logging
 import traceback
 from threading import Thread, Event, RLock

external_webpage/request_handler_utils.py

@@ -1,3 +1,4 @@
+from builtins import str
 import re
 from collections import OrderedDict
 

external_webpage/web_page_parser.py

@@ -17,6 +17,8 @@
 Classes for parsing web pages
 """
 
+from builtins import str
+from builtins import object
 import logging
 
 import re
@@ -90,9 +92,9 @@ def _create_block_from_channel(self, channel):
         if connected:
             units = current_value.get("Units", "")
 
-            precision = unicode(current_value.get("Precision", ""))
+            precision = str(current_value.get("Precision", ""))
 
-            value = unicode(current_value["Value"])
+            value = str(current_value["Value"])
 
             replaced = True
             while replaced:

external_webpage/web_scrapper_manager.py

@@ -1,6 +1,9 @@
 """
 Relation to web scrapper management.
 """
+from __future__ import print_function
+from builtins import range
+from builtins import object
 import json
 import logging
 import zlib
@@ -190,7 +193,7 @@ def _is_scrapper_in_inst_list(self, inst_list, scrapper):
         Returns: True if in; False otherwise
 
         """
-        for name, host in inst_list.items():
+        for name, host in list(inst_list.items()):
             if scrapper.is_instrument(name, host):
                 return True
         return False
@@ -204,7 +207,7 @@ def _scrapper_to_start(self, instruments):
         Returns:
 
         """
-        for name, host in instruments.items():
+        for name, host in list(instruments.items()):
             for scrapper in self.scrappers:
                 if scrapper.is_instrument(name, host):
                     break

run_tests.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # This file is part of the ISIS IBEX application.
 # Copyright (C) 2017 Science & Technology Facilities Council.
 # All rights reserved.
@@ -37,10 +38,10 @@
     test_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), "tests"))
     test_suite = unittest.TestLoader().discover(test_dir, pattern="test_*.py")
 
-    print "\n\n------ BEGINNING JSON Bourne UNIT TESTS ------"
+    print("\n\n------ BEGINNING JSON Bourne UNIT TESTS ------")
     ret_vals = list()
     ret_vals.append(xmlrunner.XMLTestRunner(output=xml_dir).run(test_suite))
-    print "------ UNIT TESTS COMPLETE ------\n\n"
+    print("------ UNIT TESTS COMPLETE ------\n\n")
 
     # Return failure exit code if a test failed
     sys.exit(False in ret_vals)