Import and str/unicode fixes

Author: matyasselmeci

osg-test

@@ -1,9 +1,12 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 from __future__ import print_function
 from distutils.sysconfig import get_python_lib
 from optparse import OptionParser
-import ConfigParser
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
 import os
 import re
 import signal

osgtest/library/core.py

@@ -555,7 +555,8 @@ def __run_command(command, use_test_user, a_input, a_stdout, a_stderr, log_outpu
             os.killpg(p.pid, timeout_signal)
             os._exit(0)
 
-    (stdout, stderr) = p.communicate(a_input)
+    stdout, stderr = p.communicate(to_bytes(a_input))
+    stdout, stderr = to_str(stdout), to_str(stderr)
 
     if timeout is not None:
         if p.returncode >= 0:
@@ -783,11 +784,23 @@ def run_fn_if_el_release_ok(*args, **kwargs):
     return el_release_decorator
 
 
-try:
-    unicode
-except NameError:  # python 3
-    unicode = str
+def to_str(strlike, encoding="latin-1", errors="backslashreplace"):
+    """Turns a bytes into a str (Python 3) or a unicode to a str (Python 2)"""
+    if strlike is None:
+        return
+    if not isinstance(strlike, str):
+        if str is bytes:
+            return strlike.encode(encoding, errors)
+        else:
+            return strlike.decode(encoding, errors)
+    else:
+        return strlike
 
 
-def is_string(var):
-    return isinstance(var, (str, unicode))
+def to_bytes(strlike, encoding="latin-1", errors="backslashreplace"):
+    """Turns a str into bytes (Python 3) or a unicode to a str (Python 2)"""
+    if strlike is None:
+        return
+    if not isinstance(strlike, bytes):
+        return strlike.encode(encoding, errors)
+    return strlike

osgtest/tests/test_460_stashcache.py

@@ -79,7 +79,7 @@ def test_03_http_fetch_from_cache(self):
             f = urlopen(
                 "http://localhost:%d/%s" % (getcfg("CacheHTTPPort"), path)
             )
-            result = f.read()
+            result = core.to_str(f.read())
         except IOError as e:
             self.fail("Unable to download from cache via http: %s" % e)
         self.assertEqualVerbose(result, contents, "downloaded file mismatch")

osgtest/tests/test_470_rsv.py

@@ -8,7 +8,10 @@
 import pwd
 import shutil
 import socket
-import ConfigParser
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
 
 """
 Testing number conventions:

osgtest/tests/test_550_condorce.py

@@ -3,7 +3,10 @@
 
 import os
 import re
-import urllib2
+try:
+    from urllib2 import urlopen
+except ImportError:
+    from urllib.request import urlopen
 
 import osgtest.library.condor as condor
 import osgtest.library.core as core
@@ -126,9 +129,9 @@ def test_07_ceview(self):
         core.skip_ok_unless_installed('htcondor-ce-view')
         view_url = 'http://%s:%s' % (core.get_hostname(), int(core.config['condor-ce.view-port']))
         try:
-            src = urllib2.urlopen(view_url).read()
-        except urllib2.URLError:
-            self.fail('Could not reach HTCondor-CE View at %s' % view_url)
+            src = to_str(urlopen(view_url).read())
+        except EnvironmentError as err:
+            self.fail('Could not reach HTCondor-CE View at %s: %s' % (view_url, err))
         self.assert_(re.search(r'HTCondor-CE Overview', src), 'Failed to find expected CE View contents')
         core.config['condor-ce.view-listening'] = True