Merge pull request #3511 from getnikola/fix-3510-time-zone-guessing

Fix #3510 — fix time zone guessing in init (handle gettz returning None)
getnikola · Feb 13, 2021 · da312e2 · da312e2
2 parents 9b7d12f + 1e60442
commit da312e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -31,6 +31,7 @@ New in v8.1.2
 Features
 --------
 
+* Fix time zone guessing logic in ``nikola init`` (Issue #3510)
 * Support for multiple authors per post — comma-separated, enabled by
   ``MULTIPLE_AUTHORS_PER_POST`` setting (Issue #3252)
 * Add ``navbar_custom_bg`` theme option to ``bootstrap4`` and document

diff --git a/nikola/packages/tzlocal/unix.py b/nikola/packages/tzlocal/unix.py
@@ -116,8 +116,9 @@ def _get_localzone(_root="/"):
         while start != 0:
             tzpath = tzpath[start:]
             try:
-                dateutil.tz.gettz(tzpath)
-                return tzpath
+                tested_tz = dateutil.tz.gettz(tzpath)
+                if tested_tz:
+                    return tzpath
             except Exception:
                 pass
             start = tzpath.find("/") + 1