Fix string type checking

Fix stderr print functions, logging
Use context for config files

Author: brianv0

bin/scisql-deploy.py

@@ -125,7 +125,7 @@ def check_global_args(args):
         is_socket = stat.S_ISSOCK(mode)
         if not is_socket:
             logging.fatal(
-                'Invalid MySQL socket. Use --mysql-socket options.'.format(args.mysql_socket)
+                'Invalid MySQL socket: {0}. Use --mysql-socket options.'.format(args.mysql_socket)
             )
             sys.exit(1)
 

test/base.py

@@ -30,6 +30,11 @@
 except ImportError:
     from configparser import ConfigParser
 
+try:
+   stringTypes = (str, unicode)
+except TypeError:
+   stringTypes = (str,)
+
 import MySQLdb as sql
 
 
@@ -59,25 +64,26 @@ def dbparam(x):
     elif isinstance(x, ColumnName):
         return "`" + x + "`"
     elif isinstance(x, bytes):
-        return "'" + str(x) + "'"
-    elif isinstance(x, str):
+        return "'" + str(x.decode()) + "'"
+    elif isinstance(x, stringTypes):
         return "'" + x + "'"
     else:
         return repr(x)
 
 
 def _parseMyCnf(my_cnf):
     parser = ConfigParser()
-    parser.read_file(open(my_cnf), my_cnf)
-    kw = {}
-    for section in parser.sections():
-        for key, val in parser[section].items():
-            if key == 'user':
-                kw['user'] = val
-            elif key == 'password':
-                kw['passwd'] = val
-            elif key == 'socket':
-                kw['unix_socket'] = val
+    with open(my_cnf) as conf_file:
+        parser.read_file(conf_file, my_cnf)
+        kw = {}
+        for section in parser.sections():
+            for key, val in parser[section].items():
+                if key == 'user':
+                    kw['user'] = val
+                elif key == 'password':
+                    kw['passwd'] = val
+                elif key == 'socket':
+                    kw['unix_socket'] = val
     return kw
 
 

tools/docs.py

@@ -347,8 +347,8 @@ def extract_docs_from_c(filename):
             elt = etree.XML(xml)
             docs.append(ast(elt))
         except:
-            sys.stderr.write("Failed to parse documentation block:\n\n%s\n\n" % xml)
-            sys.stderr.write(traceback.format_exc())
+            print("Failed to parse documentation block:\n\n%s\n\n" % xml, file=sys.stderr)
+            print(traceback.format_exc(), file=sys.stderr)
     return docs
 
 
@@ -372,8 +372,8 @@ def extract_docs_from_sql(filename):
             elt = etree.XML(string.Template(xml).safe_substitute(os.environ))
             docs.append(ast(elt))
         except ValueError:
-            sys.stderr.write("Failed to parse documentation block:\n\n%s\n\n" % xml)
-            sys.stderr.write(traceback.format_exc())
+            print("Failed to parse documentation block:\n\n%s\n\n" % xml, file=sys.stderr)
+            print(traceback.format_exc(), file=sys.stderr)
     return docs
 
 
@@ -425,7 +425,8 @@ def _test(obj):
                 with open(os.devnull, 'wb') as devnull:
                     subprocess.check_call(args, shell=False, stdin=source, stdout=devnull)
             except subprocess.CalledProcessError:
-                sys.stderr.write("Failed to run documentation example:\n\n%s\n\n" % ex.source)
+                print("Failed to run documentation example:\n\n%s\n\n" % ex.source,
+                      file=sys.stderr)
                 nfail += 1
     return nfail 
 

tools/undeploy.py

@@ -67,16 +67,17 @@
 
 def _parseMyCnf(my_cnf):
     parser = ConfigParser()
-    parser.read_file(open(my_cnf), my_cnf)
-    kw = {}
-    for section in parser.sections():
-        for key, val in parser[section].items():
-            if key == 'user':
-                kw['user'] = val
-            elif key == 'password':
-                kw['passwd'] = val
-            elif key == 'socket':
-                kw['unix_socket'] = val
+    with open(my_cnf) as conf_file:
+        parser.read_file(conf_file, my_cnf)
+        kw = {}
+        for section in parser.sections():
+            for key, val in parser[section].items():
+                if key == 'user':
+                    kw['user'] = val
+                elif key == 'password':
+                    kw['passwd'] = val
+                elif key == 'socket':
+                    kw['unix_socket'] = val
     return kw