PEP8 coding style changes.

[chrisu/seepark.git] / owm.py

diff --git a/owm.py b/owm.py
index 307e91061454da269fd558ae1e52216e2e41dcdf..237c3d771e20fee2098ec64cb68a077ed7439d82 100755 (executable)
--- a/owm.py
+++ b/owm.py
@@ -18,7 +18,7 @@ import os
 from pprint import pprint
 
 import sqlalchemy
-from sqlalchemy import create_engine, Table
+from sqlalchemy import create_engine, Table, URL
 
 from seeparklib.openweathermap import openweathermap_json
 
@@ -28,7 +28,7 @@ def fromtimestamp(timestamp):
 
 
 # https://stackoverflow.com/questions/7490660/converting-wind-direction-in-angles-to-text-words
-def degToCompass(num):
+def deg_to_compass(num):
     if num is None or num is math.nan:
         return 'N/A'
     val=int((num/22.5)+.5)
@@ -36,7 +36,7 @@ def degToCompass(num):
     return arr[(val % 16)]
 
 
-def extractweatherdata(w):
+def extract_weather_data(w):
     data = dict(
         datetime = fromtimestamp(w['dt']),
         sunrise = fromtimestamp(w['sys']['sunrise']),
@@ -51,7 +51,7 @@ def extractweatherdata(w):
     )
 
     data['winddegrees'] = w['wind']['deg'] if 'deg' in w['wind'] else math.nan
-    data['winddirection'] = degToCompass(data['winddegrees'])
+    data['winddirection'] = deg_to_compass(data['winddegrees'])
     data['precipitation'] = w['rain']['3h'] if 'rain' in w and w['rain'].get('3h') else math.nan
     data['visibility'] = w.get('visibility', math.nan)
 
@@ -81,19 +81,19 @@ def write_db(config, url, weather_json, weather_data):
     host = config.get('database','hostname')
     db = config.get('database','database')
 
-    engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
-    conn = engine.connect()
-    row = dict(cityid=config.get('openweathermap', 'cityid'), url=url, result=json.dumps(weather_json))
-    row.update(weather_data)
-    for key, value in row.items():
-        if isinstance(value, float) and math.isnan(value):
-            row[key] = None
-    metadata = sqlalchemy.MetaData()
-    openweathermap_table = Table('openweathermap', metadata, autoload_with=engine)
-    ins = openweathermap_table.insert().prefix_with('IGNORE').values(**row)
-    conn.execute(ins)
-    conn.commit()
-    conn.close()
+    db_url = URL.create(drivername='mysql+mysqldb', username=user, password=pwd, host=host, database=db)
+    engine = create_engine(db_url, echo=False)
+    with engine.connect() as conn:
+        row = dict(cityid=config.get('openweathermap', 'cityid'), url=url, result=json.dumps(weather_json))
+        row.update(weather_data)
+        for key, value in row.items():
+            if isinstance(value, float) and math.isnan(value):
+                row[key] = None
+        metadata = sqlalchemy.MetaData()
+        openweathermap_table = Table('openweathermap', metadata, autoload_with=engine)
+        ins = openweathermap_table.insert().prefix_with('IGNORE').values(**row)
+        conn.execute(ins)
+        conn.commit()
 
 
 def main(configfile, debug):
@@ -106,7 +106,7 @@ def main(configfile, debug):
     url, weather_json = openweathermap_json(apikey, cityid)
     if debug:
         pprint(weather_json)
-    weather_data = extractweatherdata(weather_json)
+    weather_data = extract_weather_data(weather_json)
     if debug:
         pprint(weather_data)