refactor/modernize the calls to open()

use "with", flags

pysollib/actions.py

@@ -519,7 +519,8 @@ class PysolMenubar(PysolMenubarTk):
                     text += os.linesep
                 enc = locale.getpreferredencoding()
                 try:
-                    open(fn, 'a').write(text.encode(enc, 'replace'))
+                    with open(fn, 'at') as fh:
+                        fh.write(text.encode(enc, 'replace'))
                 except Exception as err:
                     d = MfxExceptionDialog(
                         self.top, err,

pysollib/cardsetparser.py

@@ -32,7 +32,7 @@ def read_cardset_config(dirname, filename):
 
     This function returns None if any errors occurred.
     """
-    with open(filename, "r") as f:
+    with open(filename, "rt") as f:
         lines = f.readlines()
     lines = [line.strip() for line in lines]
     if not lines[0].startswith("PySol"):

pysollib/htmllib2.py

@@ -498,19 +498,15 @@ def test(args=None):
         fn = 'test.html'
 
     if fn == '-':
-        f = sys.stdin
+        data = sys.stdin.read()
     else:
         try:
-            f = open(fn, 'r')
+            with open(fn, 'rt') as fh:
+                data = fh.read()
         except IOError as msg:
             print(fn, ":", msg)
             sys.exit(1)
 
-    data = f.read()
-
-    if f is not sys.stdin:
-        f.close()
-
     if silent:
         f = formatter.NullFormatter()
     else:

pysollib/mfxutil.py

@@ -285,30 +285,23 @@ class KwStruct:
 # ************************************************************************
 
 def pickle(obj, filename, protocol=0):
-    f = None
     try:
-        f = open(filename, "wb")
+        with open(filename, "wb") as fh:
-        Pickler(f, protocol).dump(obj)
+            Pickler(fh, protocol).dump(obj)
-        f.close()
-        f = None
         # print "Pickled", filename
     finally:
-        if f:
+        pass
-            f.close()
 
 
 def unpickle(filename):
-    f, obj = None, None
+    obj = None
     try:
-        f = open(filename, "rb")
+        with open(filename, "rb") as fh:
-        x = Unpickler(f).load()
+            x = Unpickler(fh).load()
-        f.close()
-        f = None
         obj = x
         # print "Unpickled", filename
     finally:
-        if f:
+        pass
-            f.close()
     return obj
 
 

pysollib/tile/selectcardset.py

@@ -524,9 +524,10 @@ class CardsetInfoDialog(MfxDialog):
         frame.rowconfigure(1, weight=1)
         #
         text = ''
-        f = os.path.join(cardset.dir, "COPYRIGHT")
+        fn = os.path.join(cardset.dir, "COPYRIGHT")
         try:
-            text = open(f).read()
+            with open(fn, "rt") as fh:
+                text = fh.read()
         except Exception:
             pass
         if text:

pysollib/tk/selectcardset.py

@@ -487,9 +487,10 @@ class CardsetInfoDialog(MfxDialog):
         frame.rowconfigure(1, weight=1)
         #
         text = ''
-        f = os.path.join(cardset.dir, "COPYRIGHT")
+        fn = os.path.join(cardset.dir, "COPYRIGHT")
         try:
-            text = open(f).read()
+            with open(fn, "rt") as fh:
+                text = fh.read()
         except Exception:
             pass
         if text:

pysollib/ui/tktile/tkhtml.py

@@ -295,7 +295,8 @@ class Base_HTMLViewer:
                 import codecs
                 return codecs.open(url, encoding='utf-8')
             else:
-                return open(url, "rb")
+                with open(url, "rb") as fh:
+                    return fh
         return my_open(url), url
 
     def display(self, url, add=1, relpath=1, xview=0, yview=0):