Merge branch 'develop'

Author: sdispater

.travis.yml

@@ -22,9 +22,9 @@ matrix:
       env: PENDULUM_EXTENSIONS=1
     - python: 3.5
       env: PENDULUM_EXTENSIONS=0
-    - python: 3.6-dev
+    - python: 3.6
       env: PENDULUM_EXTENSIONS=1
-    - python: 3.6-dev
+    - python: 3.6
       env: PENDULUM_EXTENSIONS=0
     - python: pypy
 
@@ -40,7 +40,7 @@ install:
         else
           rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
         fi
-        export PYPY_VERSION="5.4.1"
+        export PYPY_VERSION="5.6.0"
         "$PYENV_ROOT/bin/pyenv" install --skip-existing "pypy-$PYPY_VERSION"
         virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
         source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+
+## [Unreleased]
+
+### Changed
+
+- Using `PRE_TRANSITION` rule no longer produces a time in a DST gap.
+- Improved performances when adding time to a `Pendulum` instance.
+- Improved parsing of ISO 8601 strings.
+- Removed deprecated methods
+
+
 ## [0.8.0] - 2016-12-23
 
 ### Added
@@ -291,6 +302,7 @@ This version causes major breaking API changes to simplify it and making it more
 Initial release
 
 
+[Unreleased]: https://github.com/sdispater/pendulum/compare/0.8.0...develop
 [0.8.0]: https://github.com/sdispater/pendulum/releases/tag/0.8.0
 [0.7.0]: https://github.com/sdispater/pendulum/releases/tag/0.7.0
 [0.6.6]: https://github.com/sdispater/pendulum/releases/tag/0.6.6

build-wheels.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSIONS="cp27-cp27m cp35-cp35m"
+PYTHON_VERSIONS="cp27-cp27m cp35-cp35m cp36-cp36m"
 
 echo "Compile wheels"
 for PYTHON in ${PYTHON_VERSIONS}; do

docs/_docs/instantiation.rst

@@ -180,7 +180,7 @@ Date
 +-----------------------------------+-------------------------------------------+
 |20120503                           |2012-05-03T00:00:00+00:00                  |
 +-----------------------------------+-------------------------------------------+
-|2012-05                            |2016-10-01T14:00:00+00:00                  |
+|2012-05                            |2012-05-01T00:00:00+00:00                  |
 +-----------------------------------+-------------------------------------------+
 
 Ordinal day

docs/_docs/interval.rst

@@ -86,32 +86,6 @@ The ``Interval`` class brings more properties than the default ``days``, ``secon
     it.microseconds
     1234
 
-.. note::
-
-    You might notice that the value of the ``seconds`` property is different that
-    the one you would obtain from the standard ``timedelta`` class.
-
-    .. code-block:: python
-
-        from datetime import timedelta
-
-        it = timedelta(days=1177, seconds=7284, microseconds=1234)
-
-        it.seconds
-        7284
-
-    The reason for that is the fact that ``pendulum`` provides the ``minutes`` and ``hours``
-    units, so ``seconds`` is just the remaining seconds after the computation of hours and minutes:
-
-    .. code-block:: python
-
-        import pendulum
-
-        it = pendulum.interval(days=1177, seconds=7284, microseconds=1234)
-
-        it.hours * 3600 + it.minutes * 60 + it.seconds
-        7284
-
 If you want to get the total duration of the interval in each supported unit
 you can use the appropriate methods.
 

docs/_docs/timezones.rst

@@ -43,7 +43,7 @@ given timezone to properly handle any transition that might have occurred.
         pendulum.set_transition_rule(pendulum.PRE_TRANSITION)
 
         pendulum.create(2013, 3, 31, 2, 30, 0, 0, 'Europe/Paris')
-        '2013-03-31T02:30:00+01:00'
+        '2013-03-31T01:30:00+01:00'
         pendulum.create(2013, 10, 27, 2, 30, 0, 0, 'Europe/Paris')
         '2013-10-27T02:30:00+02:00'
 
@@ -75,7 +75,7 @@ given timezone to properly handle any transition that might have occurred.
 
         dt = Pendulum(2013, 3, 31, 2, 30, 0, 0, 'Europe/Paris', fold=0)
         dt.isoformat()
-        '2013-03-31T02:30:00+01:00'
+        '2013-03-31T01:30:00+01:00'
 
         dt = Pendulum(2013, 3, 31, 2, 30, 0, 0, 'Europe/Paris', fold=1)
         dt.isoformat()
@@ -94,7 +94,7 @@ Shifting time to transition
 
 So, what happens when you add time to a ``Pendulum`` instance and stumble upon
 a transition time?
-Well, ``Pendulum``, provided with the context of the previous instance, will
+Well ``Pendulum``, provided with the context of the previous instance, will
 adopt the proper behavior and apply the transition accordingly.
 
 .. code-block:: python
@@ -161,7 +161,7 @@ when adding and subtracting time around transition times.
         # By default, fold is set to 0
         dt = paris.convert(dt)
         dt.isoformat()
-        '2013-03-31T02:30:00+01:00'
+        '2013-03-31T01:30:00+01:00'
 
         dt = datetime(2013, 3, 31, 2, 30, fold=1)
         dt = paris.convert(dt)
@@ -229,7 +229,7 @@ when adding and subtracting time around transition times.
         dt = datetime(2013, 3, 31, 2, 30)
         dt = tz.convert(dt, dst_rule=tz.PRE_TRANSITION)
         dt.isoformat()
-        '2013-03-31T02:30:00+01:00'
+        '2013-03-31T01:30:00+01:00'
         tz.convert(dt, dst_rule=tz.TRANSITION_ERROR)
         # NonExistingTime: The datetime 2013-03-31 02:30:00 does not exist.
 

pendulum/__init__.py

@@ -54,8 +54,6 @@
 tomorrow = Pendulum.tomorrow
 yesterday = Pendulum.yesterday
 create = Pendulum.create
-from_date = Pendulum.create_from_date
-from_time = Pendulum.create_from_time
 from_format = Pendulum.create_from_format
 strptime = Pendulum.strptime
 from_timestamp = Pendulum.create_from_timestamp

pendulum/constants.py

@@ -53,37 +53,37 @@
 
 # The number of seconds in an aligned 100-year chunk, for those that
 # do not begin with a leap year and those that do respectively.
-SECS_PER_100_YEARS = [
+SECS_PER_100_YEARS = (
     (76 * DAYS_PER_N_YEAR + 24 * DAYS_PER_L_YEAR) * SECS_PER_DAY,
-    (75 * DAYS_PER_N_YEAR + 25 * DAYS_PER_L_YEAR) * SECS_PER_DAY,
-]
+    (75 * DAYS_PER_N_YEAR + 25 * DAYS_PER_L_YEAR) * SECS_PER_DAY
+)
 
 # The number of seconds in an aligned 4-year chunk, for those that
 # do not begin with a leap year and those that do respectively.
-SECS_PER_4_YEARS = [
+SECS_PER_4_YEARS = (
     (4 * DAYS_PER_N_YEAR + 0 * DAYS_PER_L_YEAR) * SECS_PER_DAY,
-    (3 * DAYS_PER_N_YEAR + 1 * DAYS_PER_L_YEAR) * SECS_PER_DAY,
-]
+    (3 * DAYS_PER_N_YEAR + 1 * DAYS_PER_L_YEAR) * SECS_PER_DAY
+)
 
 # The number of seconds in non-leap and leap years respectively.
-SECS_PER_YEAR = [
+SECS_PER_YEAR = (
     DAYS_PER_N_YEAR * SECS_PER_DAY,
-    DAYS_PER_L_YEAR * SECS_PER_DAY,
-]
+    DAYS_PER_L_YEAR * SECS_PER_DAY
+)
 
 # The month lengths in non-leap and leap years respectively.
-DAYS_PER_MONTHS = [
-    [-1, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
-    [-1, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-]
+DAYS_PER_MONTHS = (
+    (-1, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31),
+    (-1, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31)
+)
 
 # The day offsets of the beginning of each (1-based) month in non-leap
 # and leap years respectively.
 # For example, in a leap year there are 335 days before December.
-MONTHS_OFFSETS = [
-    [-1, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365],
-    [-1, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366]
-]
+MONTHS_OFFSETS = (
+    (-1, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365),
+    (-1, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366)
+)
 
 TM_SUNDAY = 0
 TM_MONDAY = 1

pendulum/formatting/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from .formatter import Formatter
 from .classic_formatter import ClassicFormatter
 from .alternative_formatter import AlternativeFormatter
 
@@ -8,3 +9,27 @@
     'classic': ClassicFormatter(),
     'alternative': AlternativeFormatter(),
 }
+
+
+def register_formatter(name, formatter):
+    """
+    Register a new formatter.
+
+    :param name: The name of the formatter.
+    :type name: str
+
+    :param formatter: The formatter instance
+    :type formatter: Formatter
+
+    :rtype: None
+    """
+    if name in FORMATTERS:
+        raise ValueError('Formatter [{}] already exists'.format(name))
+
+    if not isinstance(formatter, Formatter):
+        raise ValueError(
+            'The formatter instance '
+            'must be an instance of Formatter'
+        )
+
+    FORMATTERS[name] = formatter

pendulum/interval.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import warnings
 from datetime import timedelta
 
 from .mixins.interval import (
@@ -79,53 +78,6 @@ def total_days(self):
     def total_weeks(self):
         return self.total_days() / 7
 
-    def total_months(self):
-        warnings.warn(
-            'Interval.total_months() is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        return round(self.total_days() / 30.436875, 1)
-
-    def total_years(self):
-        warnings.warn(
-            'Interval.total_years() is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        return round(self.total_days() / 365.2425, 1)
-
-    @property
-    def years(self):
-        warnings.warn(
-            'Interval.years is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        if self._y is None:
-            days = self._days
-            self._y = int(round(abs(days) / 365, 1) * self._sign(days))
-
-        return self._y
-
-
-    @property
-    def months(self):
-        warnings.warn(
-            'Interval.months is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        if self._m is None:
-            days = self._days
-            self._m = int(round(abs(days) / 30.436875, 1) % 12 * self._sign(days))
-
-        return self._m
-
     @property
     def weeks(self):
         return abs(self.days) // 7 * self._sign(self._days)
@@ -134,20 +86,9 @@ def weeks(self):
     def days(self):
         return self._days
 
-    @property
-    def days_exclude_weeks(self):
-        warnings.warn(
-            'Interval.days_exclude_weeks is deprecated. '
-            'It will be removed in the next major version. '
-            'Use Interval.remaing_days instead.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        return abs(self._days) % 7 * self._sign(self._days)
-
     @property
     def remaining_days(self):
-        return self.days_exclude_weeks
+        return abs(self._days) % 7 * self._sign(self._days)
 
     @property
     def hours(self):
@@ -192,24 +133,6 @@ def invert(self):
 
         return self._invert
 
-    def in_years(self):
-        warnings.warn(
-            'Interval.in_years() is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        return int(self.total_years())
-
-    def in_months(self):
-        warnings.warn(
-            'Interval.in_months() is deprecated. '
-            'It will be removed in the next major version.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-        return int(self.total_months())
-
     def in_weeks(self):
         return int(self.total_weeks())