Patchwork [bitbake-devel,v2] toaster: Allow toaster to start without pytz

login
register
mail settings
Submitter Paul Eggleton
Date April 9, 2014, 5:20 p.m.
Message ID <1397064045-30314-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/70395/
State New
Headers show

Comments

Paul Eggleton - April 9, 2014, 5:20 p.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

This patch allows toaster to start without pytz.

Django can work with or without pytz, but in the
time zone fix I mistakenly added a hard dependency
on this module.

This patch eliminates the hard dependency.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
---

v2: Fix authorship and indentation issues

 lib/toaster/toastermain/settings.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Patch

diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py
index 6e9d85d..645f327 100644
--- a/lib/toaster/toastermain/settings.py
+++ b/lib/toaster/toastermain/settings.py
@@ -64,15 +64,19 @@  else:
     for dirpath, dirnames, filenames in os.walk(ZONEINFOPATH):
         for fn in filenames:
             filepath = os.path.join(dirpath, fn)
+            zonename = filepath.lstrip(ZONEINFOPATH).strip()
             try:
                 import pytz
                 from pytz.exceptions import UnknownTimeZoneError
-                zonename = filepath.lstrip(ZONEINFOPATH).strip()
-                if pytz.timezone(zonename) is not None:
-                    zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
-            except UnknownTimeZoneError, ValueError:
-                # we expect timezone failures here, just move over
                 pass
+                try:
+                    if pytz.timezone(zonename) is not None:
+                        zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
+                except UnknownTimeZoneError, ValueError:
+                    # we expect timezone failures here, just move over
+                    pass
+            except ImportError:
+                zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename
 
     TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()]