python3 - 2to3 + miscell obvious tweaks

[sfa.git] / sfa / util / py23.py

diff --git a/sfa/util/py23.py b/sfa/util/py23.py
index c1a0ec8..cb2e1e2 100644 (file)
--- a/sfa/util/py23.py
+++ b/sfa/util/py23.py
@@ -1,25 +1,10 @@
 # our own simplistic replacement for six
-try:
-    StringType = basestring
-except:
-    StringType = str
+import sys
+PY3 = sys.version_info[0] == 3
 
-try:
-    from StringIO import StringIO
-except:
-    from io import StringIO
+StringType = str
+from io import StringIO
 
-try:
-    import xmlrpclib as xmlrpc_client
-except:
-    from xmlrpc import client as xmlrpc_client
-
-try:
-    import httplib as http_client
-except:
-    from http import client as http_client
-    
-try:
-    import ConfigParser
-except:
-    import configparser as ConfigParser
+import xmlrpc.client as xmlrpc_client
+import http.client as http_client
+import configparser as ConfigParser