commit 36efbc04a1b97393bec066669624352ddccabfcc
author George Keishing <gkeishin@in.ibm.com> Wed Dec 12 10:18:23 2018 -0600
committer George Keishing <gkeishin@in.ibm.com> Wed Dec 19 09:06:11 2018 +0000
tree c0e7991e287d832aa85d0c133a492634e06f50e5
parent 8d69338ff63a1b8a8e207c5836f5bb3801e95632

Python 2.7x and 3.xx compatibility fixes

Change-Id: I84eb3bf7691fa867acadf9dae8c4f56a9781bf73
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

syslib/utils_os.robot

diff --git a/syslib/utils_os.robot b/syslib/utils_os.robot
index 0c518a3..89a5d5e 100755
--- a/syslib/utils_os.robot
+++ b/syslib/utils_os.robot
@@ -2,6 +2,7 @@
 Documentation      Keywords for system test.
 
 Library            ../lib/gen_robot_keyword.py
+Library            ../lib/gen_robot_print.py
 Resource           ../lib/boot_utils.robot
 Resource           ../extended/obmc_boot_test_resource.robot
 Resource           ../lib/utils.robot
@@ -222,14 +223,14 @@
     ${temperature_objs}=  Read Properties
     ...  ${SENSORS_URI}temperature/enumerate
     # Filter the dictionary to get just the CPU temperature info.
-    ${cmd}=  Catenate  {k:v for k,v in $temperature_objs.iteritems()
+    ${cmd}=  Catenate  {k:v for k,v in $temperature_objs.items()
     ...  if re.match('${SENSORS_URI}temperature/p.*core.*temp', k)}
     ${cpu_temperatuture_objs}  Evaluate  ${cmd}  modules=re
     # Create a list of the CPU temperature values (current).
     ${cpu_temperatures}=  Evaluate
     ...  [ x['Value'] for x in $cpu_temperatuture_objs.values() ]
 
-    ${cpu_max_temp}  Evaluate  max(map(int, $cpu_temperatures))/1000
+    ${cpu_max_temp}  Evaluate  int(max(map(int, $cpu_temperatures))/1000)
     [Return]  ${cpu_max_temp}
 
 
@@ -239,14 +240,14 @@
     ${temperature_objs}=  Read Properties
     ...  ${SENSORS_URI}temperature/enumerate
     # Filter the dictionary to get just the CPU temperature info.
-    ${cmd}=  Catenate  {k:v for k,v in $temperature_objs.iteritems()
+    ${cmd}=  Catenate  {k:v for k,v in $temperature_objs.items()
     ...  if re.match('${SENSORS_URI}temperature/p.*core.*temp', k)}
     ${cpu_temperatuture_objs}=  Evaluate  ${cmd}  modules=re
     # Create a list of the CPU temperature values (current).
     ${cpu_temperatures}=  Evaluate
     ...  [ x['Value'] for x in $cpu_temperatuture_objs.values() ]
 
-    ${cpu_min_temp}  Evaluate  min(map(int, $cpu_temperatures))/1000
+    ${cpu_min_temp}  Evaluate  int(min(map(int, $cpu_temperatures))/1000)
     [Return]  ${cpu_min_temp}
 
 
@@ -397,7 +398,7 @@
     ${temperature_objs}=  Read Properties  ${SENSORS_URI}temperature/enumerate
     ...  timeout=30  quiet=1
 
-    ${core_temperatures_list}=  Catenate  {k:v for k,v in $temperature_objs.iteritems()
+    ${core_temperatures_list}=  Catenate  {k:v for k,v in $temperature_objs.items()
     ...  if re.match('${SENSORS_URI}temperature/.*_core_temp', k)}
     ${gpu_temperature_objs_dict}=  Evaluate  ${core_temperatures_list}  modules=re
 
@@ -407,7 +408,8 @@
 
     # Find the max temperature value and divide by 1000 to get just the integer
     # portion.
-    ${max_gpu_temperature}=  Evaluate  max(map(int, $gpu_temperatures))/1000
+    ${max_gpu_temperature}=  Evaluate
+    ...  int(max(map(int, $gpu_temperatures))/1000)
 
     [Return]  ${max_gpu_temperature}