detect sub-timezones properly (#1599)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jan 23, 2015 · c223700 · c223700
1 parent aea500e
commit c223700
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,12 +10,14 @@ Features
 Bugfixes
 --------
 
+* Correctly read sub-timezones in ``nikola init`` (via Issue #1599)
 * Fix zoneinfo reading in ``nikola init`` (Issue #1599)
 * Fix ``.islink`` detection for galleries (via Issue #1536)
 * Links to languages point to site root and not the blog (Issue #1008)
 * Brand link is now language-specific (Issue #1573)
 * Fixed compatibility with IPython 3.x (Issue #1581)
-* Compilers mark tasks as out of date if compiler-specific options and plugins change (Issue #1523)
+* Compilers mark tasks as out of date if compiler-specific options and
+  plugins change (Issue #1523)
 
 New in v7.3.0
 =============

diff --git a/nikola/packages/tzlocal/unix.py b/nikola/packages/tzlocal/unix.py
@@ -30,7 +30,7 @@ def _get_localzone():
     try:
         # link will be something like /usr/share/zoneinfo/America/Los_Angeles.
         link = os.readlink('/etc/localtime')
-        tz = link[link.rfind('/', 0, link.rfind('/')) + 1:]
+        tz = link.split('zoneinfo/')[-1]
 
         if tz:
             dateutil.tz.gettz(tz)