🎨 Some code style changes

gwhat/meteo/weather_reader.py

@@ -102,22 +102,22 @@ def __init__(self, filename, *args, **kwargs):
             self['Missing Tavg'] = load_weather_log(finfo, 'Mean Temp (deg C)')
             self['Missing Ptot'] = load_weather_log(finfo, 'Total Precip (mm)')
 
-        # ---- format data
-
-        print('Make daily time series continuous.')
+        # ---- Format Data
 
         time = copy(self['Time'])
         date = [copy(self['Year']), copy(self['Month']), copy(self['Day'])]
         vbrs = ['Tmax', 'Tavg', 'Tmin', 'Ptot', 'Rain', 'PET']
         data = [self[x] for x in vbrs]
 
+        # Make daily time series continuous :
+
         time, date, data = make_timeserie_continuous(self['Time'], date, data)
         self['Time'] = time
         self['Year'], self['Month'], self['Day'] = date[0], date[1], date[2]
         for i, vbr in enumerate(vbrs):
             self[vbr] = data[i]
 
-        print('Fill missing with estimated values.')
+        # Fill missing with estimated values :
 
         for vbr in ['Tmax', 'Tavg', 'Tmin', 'PET']:
             self[vbr] = fill_nan(self['Time'], self[vbr], vbr, 'interp')

gwhat/meteo/weather_viewer.py

@@ -878,7 +878,7 @@ def initUI(self):
 
     def populate_table(self, NORMALS):
 
-        # ---- Air Temperature ----
+        # ---- Air Temperature
 
         for row, key in enumerate(['Tmax', 'Tmin', 'Tavg']):
             # Months
@@ -895,7 +895,7 @@ def populate_table(self, NORMALS):
             item.setTextAlignment(Qt.AlignCenter)
             self.setItem(row, 12, item)
 
-        # ---- Rain ----
+        # ---- Rain
 
         row = 3
         # Months
@@ -912,7 +912,7 @@ def populate_table(self, NORMALS):
         item.setTextAlignment(Qt.AlignCenter)
         self.setItem(row, 12, item)
 
-        # ---- Snow ----
+        # ---- Snow
 
         row = 4
         # Months
@@ -930,7 +930,7 @@ def populate_table(self, NORMALS):
         item.setTextAlignment(Qt.AlignCenter)
         self.setItem(row, 12, item)
 
-        # ---- Total Precip ----
+        # ---- Total Precip
 
         row = 5
         # Months
@@ -946,9 +946,10 @@ def populate_table(self, NORMALS):
         item.setTextAlignment(Qt.AlignCenter)
         self.setItem(row, 12, item)
 
-        # ---- ETP ----
+        # ---- ETP
 
         row = 6
+        # Months
         for col in range(12):
             item = QTableWidgetItem('%0.1f' % NORMALS['PET'][col])
             item.setFlags(item.flags() & ~Qt.ItemIsEditable)

gwhat/projet/reader_projet.py

@@ -106,10 +106,11 @@ def convert_projet_format(self, filename):
     def close_projet(self):
         try:
             self.db.close()
-        except:
-            pass  # projet is None or already closed
+        except AttributeError:
+            # projet is None or already closed.
+            pass
 
-    # =========================================================================
+    # ---- Project Properties
 
     @property
     def name(self):
@@ -169,7 +170,7 @@ def lon(self):
     def lon(self, x):
         self.db.attrs['longitude'] = x
 
-    # ======================================================== water level ====
+    # ---- Water Levels Dataset Handlers
 
     @property
     def wldsets(self):
@@ -232,7 +233,7 @@ def add_wldset(self, name, df):
             self.db.flush()
 
             print('New dataset created sucessfully')
-        except:
+        except Exception:
             print('Unable to save dataset to project db')
             del self.db['wldsets'][name]
 
@@ -241,7 +242,7 @@ def add_wldset(self, name, df):
     def del_wldset(self, name):
         del self.db['wldsets/%s' % name]
 
-    # =========================================================== weather =====
+    # ---- Weather Dataset Handlers
 
     @property
     def wxdsets(self):
@@ -474,12 +475,11 @@ def get_layout(self):
         return layout
 
 
-# :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-
 class WXDataFrameHDF5(dict):
-    # This is a wrapper around the h5py group that is used to mimick the
-    # structure of WXDataFrame in meteo_utils.
+    """
+    This is a wrapper around the h5py group that is used to mimick the
+    structure of WXDataFrame in gwhat.meteo.weather_reader.
+    """
     def __init__(self, dset, *args, **kwargs):
         super(WXDataFrameHDF5, self).__init__(*args, **kwargs)
         self.dset = dset
@@ -508,6 +508,6 @@ def name(self):
 
 
 if __name__ == '__main__':
-    f = 'C:/Users/jnsebgosselin/Desktop/testé/testé.what'
-    f = 'C:/Users/jsgosselin/OneDrive/WHAT/WHAT/tests/Example.what'
+    f = ("C:/Users/jsgosselin/GWHAT/"
+         "gwhat/tests/@ new-prô'jèt!/@ new-prô'jèt!.gwt")
     pr = ProjetReader(f)