Changeset c77630a in flex_extract.git for Source/Python/Classes/GribUtil.py

Timestamp:

Aug 13, 2019, 12:32:22 PM (5 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

0690a6c

Parents:

33a4ccc

Message:

BUGFIX: for python3-eccodes the file openings need to be in binary mode! added binary marker in filemode

File:

• Source/Python/Classes/GribUtil.py (modified) (9 diffs)

Source/Python/Classes/GribUtil.py

@@ -91 +91 @@
                              codes_release)
 
-        fileid = open(self.filenames, 'r')
-
         return_list = []
 
-        while 1:
+        with open(self.filenames, 'rb') as fileid:
+
             gid = codes_new_from_file(fileid)
-
-            if gid is None:
-                break
 
             if len(wherekeynames) != len(wherekeyvalues):
@@ -123 +119 @@
             codes_release(gid)
 
-        fileid.close()
-
         return return_list
 
 
     def set_keys(self, fromfile, keynames, keyvalues, wherekeynames=[],
-                 wherekeyvalues=[], strict=False, filemode='w'):
+                 wherekeyvalues=[], strict=False, filemode='wb'):
         '''Opens the file to read the grib messages and then write
         the selected messages (with wherekeys) to a new output file.
@@ -161 +155 @@
 
         filemode : :obj:`string`, optional
-            Sets the mode for the output file. Default is "w".
+            Sets the mode for the output file. Default is "wb".
 
         Return
@@ -175 +169 @@
 
         fout = open(self.filenames, filemode)
-        fin = open(fromfile)
-
-        while 1:
+
+        with open(fromfile, 'rb') as fin:
             gid = codes_grib_new_from_file(fin)
-
-            if gid is None:
-                break
 
             select = True
@@ -206 +196 @@
             codes_release(gid)
 
-        fin.close()
         fout.close()
 
@@ -212 +201 @@
 
     def copy_dummy_msg(self, filename_in, selectWhere=True,
-                 keynames=[], keyvalues=[], filemode='w'):
+                 keynames=[], keyvalues=[], filemode='wb'):
         '''Add the content of another input grib file to the objects file but
         only messages corresponding to keys/values passed to the function.
@@ -235 +224 @@
 
         filemode : :obj:`string`, optional
-            Sets the mode for the output file. Default is "w".
+            Sets the mode for the output file. Default is "wb".
 
         Return
@@ -247 +236 @@
             raise Exception("Give a value for each keyname!")
 
-        fin = open(filename_in, 'rb')
+
         fout = open(self.filenames, filemode)
 
         fields = 0
 
-        while fields < 1:
+        with open(filename_in, 'rb') as fin:
+            if fields >= 1:
+                fout.close()
+                return
+
             gid = codes_grib_new_from_file(fin)
-
-            if gid is None:
-                break
 
             select = True
@@ -278 +268 @@
             codes_release(gid)
 
-        fin.close()
         fout.close()