From c13a611b4b0c1cd43a434fde8f69c92e068bf496 Mon Sep 17 00:00:00 2001 From: Lonesome byte Date: Mon, 12 Aug 2019 17:36:13 +0200 Subject: [PATCH] Lowering cyclomatic complexity --- bumblebee/modules/sun.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/bumblebee/modules/sun.py b/bumblebee/modules/sun.py index 2f62079..60a27d0 100644 --- a/bumblebee/modules/sun.py +++ b/bumblebee/modules/sun.py @@ -44,23 +44,28 @@ class Module(bumblebee.engine.Module): return u"\u21A5{} \u21A7{}".format(self._sunrise.strftime('%H:%M'), self._sunset.strftime('%H:%M')) return "?" + def _calculate_times(self): + try: + sun = Sun(self._lat, self._lon) + except Exception: + self._sunrise = None + self._sunset = None + return + + try: + self._sunrise = sun.get_local_sunrise_time() + except SunTimeException: + self._sunrise = 'no sunrise' + + try: + self._sunset = sun.get_local_sunset_time() + except SunTimeException: + self._sunset = 'no sunset' + def update(self, widgets): if not self._lat or not self._lon: self._sunrise = None self._sunset = None - try: - sun = Sun(self._lat, self._lon) - try: - self._sunrise = sun.get_local_sunrise_time() - except SunTimeException: - self._sunrise = 'no sunrise' - - try: - self._sunset = sun.get_local_sunset_time() - except SunTimeException: - self._sunset = 'no sunset' - except Exception: - self._sunrise = None - self._sunset = None + self._calculate_times() # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4