wrap csv filenames in os.path.expanduser()

to allow ~ in filenames in ini file

diff --git a/owm.py b/owm.py
index d42ebed28136758fbee389fd5ae73bba603156cf..878e3eba8c1dac4b37072189fcbd5f5b87b5ecea 100755 (executable)
--- a/owm.py
+++ b/owm.py
@@ -94,6 +94,7 @@ def main(configfile):
     config.read(configfile)
     apikey = config.get('openweathermap', 'apikey')
     cityid = config.get('openweathermap', 'cityid')
+    csvfile = config.get("openweathermap", 'csvfilename')
 
     weather_raw = getweather(apikey, cityid)
     if debug:
@@ -106,7 +107,7 @@ def main(configfile):
     # write to db
 
     # write to csv
-    write_csv(config.get("openweathermap", 'csvfilename'), weather)
+    write_csv(os.path.expanduser(csvfile), weather)
 
 
 if __name__ == '__main__':

diff --git a/seewasser.py b/seewasser.py
index dfed1cfa06e6fa6379045aa8fe0d9e4758936456..724beb694fef691592b7a60bb370b9d898102eb1 100755 (executable)
--- a/seewasser.py
+++ b/seewasser.py
@@ -54,7 +54,7 @@ def readsensor(sensor_id):
 
 def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
     # Schreiben des csv-files
-    file = open(config.get("csv", "filename"), "a", newline = "")
+    file = open(os.path.expanduser(config.get("csv", "filename")), "a", newline = "")
     writer = csv.writer(file, dialect = "excel")
     writer.writerow([timestamp.strftime("%Y-%m-%d %H:%M"), sensor_id, sensor_name, "{:.1f}".format(value)])