Python 2.x and 3.x compatible changes
Changes:
- Update imports and syntax.
Resolves openbmc/openbmc-test-automation#1426
Change-Id: I4cf400429c5f863ed8f30d24fa871b1c564d9f2a
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/data/variables.py b/data/variables.py
index 1986a6b..883dbba 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -154,8 +154,8 @@
if l_https_port:
l_suffix = ':' + l_https_port
except BaseException:
- print "Environment variable HTTPS_PORT not set,\
- using default HTTPS port"
+ print ("Environment variable HTTPS_PORT not set,\
+ using default HTTPS port")
return l_suffix
diff --git a/lib/disable_warning_urllib.py b/lib/disable_warning_urllib.py
index e9810c5..55a7239 100644
--- a/lib/disable_warning_urllib.py
+++ b/lib/disable_warning_urllib.py
@@ -1,7 +1,10 @@
#!/usr/bin/python
import logging
import warnings
-import httplib
+try:
+ import httplib
+except ImportError:
+ import http.client
warnings.filterwarnings("ignore")
diff --git a/lib/gen_arg.py b/lib/gen_arg.py
index 313a486..7c82ece 100755
--- a/lib/gen_arg.py
+++ b/lib/gen_arg.py
@@ -6,7 +6,10 @@
"""
import sys
-import __builtin__
+try:
+ import __builtin__
+except ImportError:
+ import builtins as __builtin__
import atexit
import signal
import argparse
diff --git a/lib/gen_misc.py b/lib/gen_misc.py
index 84eb894..13db4c1 100755
--- a/lib/gen_misc.py
+++ b/lib/gen_misc.py
@@ -9,7 +9,10 @@
import errno
import os
import ConfigParser
-import StringIO
+try:
+ from StringIO import StringIO
+except ImportError:
+ from io import StringIO
import re
import socket
import tempfile
diff --git a/lib/gen_print.py b/lib/gen_print.py
index 98ab72c..9b877dd 100755
--- a/lib/gen_print.py
+++ b/lib/gen_print.py
@@ -13,7 +13,10 @@
import grp
import socket
import argparse
-import __builtin__
+try:
+ import __builtin__
+except ImportError:
+ import builtins as __builtin__
import logging
import collections
from wrap_utils import *