FIX: #267 (#275)

* FIX: use with-statement in `wradlib.io.rainbow.read_rainbow()`, remove logs-file * FIX: move conditional `loaddata` into with-statement, fix dual use of f
wradlib · Aug 2, 2018 · 4361cd2 · 4361cd2
1 parent 9eff708
commit 4361cd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/wradlib/io/logs b/wradlib/io/logs
diff --git a/wradlib/io/rainbow.py b/wradlib/io/rainbow.py
@@ -438,18 +438,15 @@ def read_rainbow(f, loaddata=True):
     # Check if a file handle has been passed
     try:
         f.seek(0, 0)
-        fid = f
+        rbdict = get_rb_header(f)
+        if loaddata:
+            rbdict = get_rb_blobs_from_file(f, rbdict)
     except AttributeError:
         # If we did not get a file handle, assume that we got a filename and
-        #  get a file handle for the corresponding file
-        try:
-            fid = open(f, "rb")
-        except IOError:
-            raise IOError("WRADLIB: Error opening Rainbow "
-                          "file '{}' ".format(f))
-
-    rbdict = get_rb_header(fid)
+        # use with-statement to retrieve the file content
+        with open(f, "rb") as fid:
+            rbdict = get_rb_header(fid)
+            if loaddata:
+                rbdict = get_rb_blobs_from_file(fid, rbdict)
 
-    if loaddata:
-        rbdict = get_rb_blobs_from_file(fid, rbdict)
     return rbdict