Merge branch 'master' into develop

Author: sdispater

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.5.5
+
+(September 1st, 2016)
+
+- [Fix] Fixes local timezone loading for unix systems.
+- [Fix] Fixes potential `AttributeError` in `between` method. (Thanks to [iv597](https://github.com/iv597))
+
 ### 0.5.4
 
 (August 30th, 2016)

docs/conf.py

@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.4'
+release = '0.5.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pendulum/pendulum.py

@@ -1113,9 +1113,6 @@ def between(self, dt1, dt2, equal=True):
 
         :rtype: bool
         """
-        dt1 = self._get_datetime(dt1)
-        dt2 = self._get_datetime(dt2)
-
         if dt1 > dt2:
             dt1, dt2 = dt2, dt1
 

pendulum/tz/loader.py

@@ -38,6 +38,14 @@ def load(cls, name):
         except _compat.FileNotFoundError:
             raise ValueError('Unknown timezone [{}]'.format(name))
 
+    @classmethod
+    def load_from_file(cls, filepath):
+        try:
+            with open(filepath, 'rb') as f:
+                return cls._load(f)
+        except _compat.FileNotFoundError:
+            raise ValueError('Unable to load file [{}]'.format(filepath))
+
     @classmethod
     def _load(cls, fp):
         head_fmt = '>4s c 15x 6l'

pendulum/tz/local_timezone.py

@@ -86,16 +86,14 @@ def get_tz_name_for_windows(cls):
         return get_localzone_name()
 
     @classmethod
-    def get_tz_name_for_unix(cls):
+    def get_tz_name_for_unix(cls, _root='/'):
         tzenv = os.environ.get('TZ')
         if tzenv:
             try:
                 return _tz_from_env(tzenv)
             except ValueError:
                 pass
 
-        _root = '/'
-
         # Now look for distribution specific configuration files
         # that contain the timezone name.
         tzpath = os.path.join(_root, 'etc/timezone')
@@ -150,22 +148,23 @@ def get_tz_name_for_unix(cls):
         tzpath = os.path.join(_root, 'etc/localtime')
         if os.path.exists(tzpath) and os.path.islink(tzpath):
             tzpath = os.path.realpath(tzpath)
-            start = tzpath.find("/") + 1
-            while start is not 0:
-                tzpath = tzpath[start:]
+            parts = tzpath.split('/')[-2:]
+            while parts:
+                tzpath = '/'.join(parts)
                 try:
                     return Timezone.load(tzpath)
-                except ValueError:
+                except (ValueError, IOError, OSError):
                     pass
-                start = tzpath.find("/") + 1
+
+                parts.pop(0)
 
         # No explicit setting existed. Use localtime
         for filename in ('etc/localtime', 'usr/local/etc/localtime'):
             tzpath = os.path.join(_root, filename)
 
             if not os.path.exists(tzpath):
                 continue
-            return Timezone('', *Loader.load(tzpath))
+            return Timezone('', *Loader.load_from_file(tzpath))
 
         raise RuntimeError('Can not find any timezone configuration')
 

pendulum/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '0.5.4'
+VERSION = '0.5.5'

tests/fixtures/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+

tests/fixtures/tz/Paris

@@ -0,0 +1 @@
+../usr/share/zoneinfo/Europe/Paris