From 61fd68628aaa2d98b8368b1d8ab5126988dd2c13 Mon Sep 17 00:00:00 2001 From: Ace Date: Fri, 5 Jun 2020 17:47:12 +0200 Subject: [PATCH] Revert "Merge pull request #120 from emilyboda/feature/weather-fixes" This reverts commit 6a9ec373900fcea05c55830fcf6de94498694953, reversing changes made to 13556a5cf3e560d2ad788b0c15340176b760ef3a. --- modules/inkycal_weather.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/inkycal_weather.py b/modules/inkycal_weather.py index e9d4943..6e361cf 100644 --- a/modules/inkycal_weather.py +++ b/modules/inkycal_weather.py @@ -143,7 +143,7 @@ def to_hours(datetime_object, simple = False): converted_time = datetime_object.format('HH:mm') else: if simple == True: - converted_time = datetime_object.format('h a') + converted_time = datetime_object.format('H a') else: converted_time = datetime_object.format('hh:mm') return str(converted_time) @@ -171,7 +171,7 @@ def generate_image(): forecast = owm.three_hours_forecast(location) """Round the hour to the nearest multiple of 3""" - now = arrow.utcnow().to(get_tz()) + now = arrow.utcnow() if (now.hour % 3) != 0: hour_gap = 3 - (now.hour % 3) else: @@ -184,10 +184,10 @@ def generate_image(): fc4 = now.replace(hours = + hour_gap + 9).floor('hour') """Prepare forecast objects for the specified timings""" - forecast_fc1 = forecast.get_weather_at(fc1.datetime.astimezone(timezone('UTC'))) - forecast_fc2 = forecast.get_weather_at(fc2.datetime.astimezone(timezone('UTC'))) - forecast_fc3 = forecast.get_weather_at(fc3.datetime.astimezone(timezone('UTC'))) - forecast_fc4 = forecast.get_weather_at(fc4.datetime.astimezone(timezone('UTC'))) + forecast_fc1 = forecast.get_weather_at(fc1.datetime) + forecast_fc2 = forecast.get_weather_at(fc2.datetime) + forecast_fc3 = forecast.get_weather_at(fc3.datetime) + forecast_fc4 = forecast.get_weather_at(fc4.datetime) """Get the current temperature and forcasts temperatures""" temperature_now = to_units(weather.get_temperature()['temp'])