Fix some pylint issues

[infoex-autowx.git] / infoex-autowx.py

diff --git a/infoex-autowx.py b/infoex-autowx.py
index 3fe07fcbc0754948f02ff22e45d009e588bb3290..aeac27c27397acba8f3b68005fb9326682e03038 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -230,7 +230,7 @@ def main():
                     infoex['wx_data'] = []
             except Exception as exc:
                 LOG.error("Python program for custom Wx data failed in "
                     infoex['wx_data'] = []
             except Exception as exc:
                 LOG.error("Python program for custom Wx data failed in "

-                          "execution: " + str(exc))
+                          "execution: %s", str(exc))

                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")
                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")


@@ -243,7 +243,7 @@ def main():
             sys.exit(1)
         except Exception as exc:
             LOG.error("A problem was encountered when attempting to "
             sys.exit(1)
         except Exception as exc:
             LOG.error("A problem was encountered when attempting to "

-                      "load your custom Wx program: " + str(exc))
+                      "load your custom Wx program: %s", str(exc))

             sys.exit(1)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -
             sys.exit(1)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -


@@ -289,7 +289,7 @@ def main():
 
     LOG.debug("final_data: %s", str(final_data))
 
 
     LOG.debug("final_data: %s", str(final_data))
 

-    if len(infoex['wx_data']) > 0:
+    if infoex['wx_data']:

         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])
         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])


@@ -474,9 +474,14 @@ def get_mesowest_data(begin, end, station):
 
         # we may not have the data at all
         key_name = element_cd + '_set_1'
 
         # we may not have the data at all
         key_name = element_cd + '_set_1'

+

         if key_name in observations:
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
         if key_name in observations:
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]

+
+                # mesowest provides wind_speed in m/s, we want mph
+                if element_cd in ('wind_speed', 'wind_gust'):
+                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])

             else:
                 remote_data[element_cd] = None
         else:
             else:
                 remote_data[element_cd] = None
         else:


@@ -535,5 +540,9 @@ def setup_time_values():
     begin_date = end_date - datetime.timedelta(hours=3)
     return (begin_date, end_date)
 
     begin_date = end_date - datetime.timedelta(hours=3)
     return (begin_date, end_date)
 

+def ms_to_mph(ms):
+    """convert meters per second to miles per hour"""
+    return ms * 2.236936
+

 if __name__ == "__main__":
     sys.exit(main())
 if __name__ == "__main__":
     sys.exit(main())