Merge branch 'master' into develop

Author: sdispater

CHANGELOG.md

@@ -13,6 +13,17 @@
 - Formatting (with f-strings or `format()`) will now use the configured formatter.
 
 
+## [1.0.2]
+
+### Changed
+
+- Adds support for external tzinfo as timezones. (Thanks to [iv597](https://github.com/iv597))
+
+### Fixed
+
+- Fixed `day_of_year` not returning the correct value. (Thanks to [asrenzo](https://github.com/asrenzo))
+
+
 ## [1.0.1]
 
 ### Fixed
@@ -321,7 +332,9 @@ This version causes major breaking API changes to simplify it and making it more
 Initial release
 
 
-[Unreleased]: https://github.com/sdispater/pendulum/compare/1.0.1...develop
+
+[Unreleased]: https://github.com/sdispater/pendulum/compare/1.0.2...develop
+[1.0.2]: https://github.com/sdispater/pendulum/releases/tag/1.0.2
 [1.0.1]: https://github.com/sdispater/pendulum/releases/tag/1.0.1
 [1.0.0]: https://github.com/sdispater/pendulum/releases/tag/1.0.0
 [0.8.0]: https://github.com/sdispater/pendulum/releases/tag/0.8.0

README.rst

@@ -1,9 +1,18 @@
 Pendulum
 ########
 
+.. image:: https://img.shields.io/pypi/v/pendulum.svg
+    :target: https://pypi.python.org/pypi/pendulum
+
+.. image:: https://img.shields.io/pypi/l/pendulum.svg
+    :target: https://pypi.python.org/pypi/pendulum
+
+.. image:: https://img.shields.io/codecov/c/github/sdispater/pendulum/master.svg
+    :target: https://codecov.io/gh/sdispater/pendulum/branch/master
+
 .. image:: https://travis-ci.org/sdispater/pendulum.png
-   :alt: Pendulum Build status
-   :target: https://travis-ci.org/sdispater/pendulum
+    :alt: Pendulum Build status
+    :target: https://travis-ci.org/sdispater/pendulum
 
 Python datetimes made easy.
 

docs/conf.py

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

pendulum/pendulum.py

@@ -70,16 +70,11 @@ def _safe_create_datetime_zone(cls, obj):
         elif isinstance(obj, datetime.tzinfo) and not isinstance(obj, Timezone):
             # pytz
             if hasattr(obj, 'localize'):
-                obj = obj.zone
-            else:
-                # We have no sure way to figure out
-                # the timezone name, we raise an error
-
-                raise ValueError('Unsupported timezone {}'.format(obj))
+                return cls._timezone(obj.zone)
 
-        tz = cls._timezone(obj)
+            return FixedTimezone(obj.utcoffset(None).total_seconds())
 
-        return tz
+        return cls._timezone(obj)
 
     @classmethod
     def _local_timezone(cls):

pendulum/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '1.0.1'
+VERSION = '1.0.2'

setup.py

@@ -91,7 +91,15 @@ def build_extension(self, ext):
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy'
     ],
 )
 

tests/pendulum_tests/test_timezone.py

@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 
+import sys
 from pendulum import Pendulum
 
 from .. import AbstractTestCase
 
+if sys.version_info >= (3, 2):
+    from datetime import timedelta, timezone
+
 
 class TimezoneTest(AbstractTestCase):
 
@@ -36,3 +40,12 @@ def test_astimezone(self):
         d = d.astimezone('Europe/Paris')
         self.assertEqual('Europe/Paris', d.timezone_name)
         self.assertPendulum(d, now.year, now.month, now.day, now.hour + 1, now.minute)
+
+        if sys.version_info >= (3, 2):
+            d = d.astimezone(timezone.utc)
+            self.assertEqual('+00:00', d.timezone_name)
+            self.assertPendulum(d, now.year, now.month, now.day, now.hour, now.minute)
+
+            d = d.astimezone(timezone(timedelta(hours=-8)))
+            self.assertEqual('-08:00', d.timezone_name)
+            self.assertPendulum(d, now.year, now.month, now.day, now.hour - 8, now.minute)