Module update: dateutil

libs/dateutil/zoneinfo/__init__.py

@@ -1,15 +1,16 @@
+# -*- coding: utf-8 -*-
 """
 Copyright (c) 2003-2005  Gustavo Niemeyer <gustavo@niemeyer.net>
 
-This module offers extensions to the standard python 2.3+
+This module offers extensions to the standard Python
 datetime module.
 """
 from dateutil.tz import tzfile
 from tarfile import TarFile
 import os
 
-__author__ = "Gustavo Niemeyer <gustavo@niemeyer.net>"
-__license__ = "PSF License"
+__author__ = "Tomi Pieviläinen <tomi.pievilainen@iki.fi>"
+__license__ = "Simplified BSD"
 
 __all__ = ["setcachesize", "gettz", "rebuild"]
 
@@ -21,8 +22,7 @@ class tzfile(tzfile):
         return (gettz, (self._filename,))
 
 def getzoneinfofile():
-    filenames = os.listdir(os.path.join(os.path.dirname(__file__)))
-    filenames.sort()
+    filenames = sorted(os.listdir(os.path.join(os.path.dirname(__file__))))
     filenames.reverse()
     for entry in filenames:
         if entry.startswith("zoneinfo") and ".tar." in entry:
@@ -66,7 +66,10 @@ def rebuild(filename, tag=None, format="gz"):
     targetname = "zoneinfo%s.tar.%s" % (tag, format)
     try:
         tf = TarFile.open(filename)
-        for name in tf.getnames():
+        # The "backwards" zone file contains links to other files, so must be
+        # processed as last
+        for name in sorted(tf.getnames(),
+                           key=lambda k: k != "backward" and k or "z"):
             if not (name.endswith(".sh") or
                     name.endswith(".tab") or
                     name == "leapseconds"):