Removes deprecated methods

Author: sdispater

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/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())
 

pendulum/pendulum.py

@@ -4,7 +4,6 @@
 
 import calendar
 import datetime
-import warnings
 
 from .date import Date
 from .time import Time
@@ -20,7 +19,6 @@
     MINUTES_PER_HOUR, SECONDS_PER_MINUTE,
     SECONDS_PER_DAY
 )
-from .utils import CallableTimestamp
 
 
 class Pendulum(Date, datetime.datetime):
@@ -378,57 +376,6 @@ def create(cls, year=None, month=None, day=None,
 
         return cls.instance(dt, tz)
 
-    @classmethod
-    def create_from_date(cls, year=None, month=None, day=None, tz='UTC'):
-        """
-        Create a Pendulum instance from just a date.
-        The time portion is set to 00:00:00.
-
-        :type year: int
-        :type month: int
-        :type day: int
-        :type tz: tzinfo or str or None
-
-        :rtype: Pendulum
-        """
-        warnings.warn(
-            'create_from_date() is deprecated. '
-            'It will be removed in the next major version. '
-            'Use create(year, month, day) instead.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-
-        return cls.create(year, month, day, tz=tz)
-
-    @classmethod
-    def create_from_time(cls, hour=0, minute=0, second=0,
-                         microsecond=0, tz='UTC'):
-        """
-        Create a Pendulum instance from just a time.
-        The date portion is set to today.
-
-        :type hour: int
-        :type minute: int
-        :type second: int
-        :type microsecond: int
-        :type tz: tzinfo or str or int or None
-
-        :rtype: Pendulum
-        """
-        warnings.warn(
-            'create_from_time() is deprecated. '
-            'It will be removed in the next major version. '
-            'Use create(hour=hour, minute=minute, second=second) instead.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-
-        return cls.now(tz).replace(
-            hour=hour, minute=minute, second=second,
-            microsecond=microsecond
-        )
-
     @classmethod
     def create_from_format(cls, time, fmt, tz=UTC):
         """
@@ -554,15 +501,11 @@ def tzinfo(self):
     def fold(self):
         return self._fold
 
-    @property
     def timestamp(self):
         if self._timestamp is None:
             delta = self._datetime - self._EPOCH
 
-            self._timestamp = CallableTimestamp(
-                delta.days * SECONDS_PER_DAY + delta.seconds
-            )
-            self._timestamp.set_float(delta.total_seconds())
+            self._timestamp = delta.total_seconds()
 
         return self._timestamp
 
@@ -648,29 +591,6 @@ def on(self, year, month, day):
             year=int(year), month=int(month), day=int(day)
         )
 
-    def with_date(self, year, month, day):
-        """
-        Returns a new instance with the current date set to a different date.
-
-        :param year: The year
-        :type year: int
-
-        :param month: The month
-        :type month: int
-
-        :param day: The day
-        :type day: int
-
-        :rtype: Pendulum
-        """
-        warnings.warn(
-            'with_date() is deprecated. Use on() instead.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-
-        return self.on(year, month, day)
-
     def at(self, hour, minute, second, microsecond=0):
         """
         Returns a new instance with the current time to a different time.
@@ -694,32 +614,6 @@ def at(self, hour, minute, second, microsecond=0):
             microsecond=microsecond
         )
 
-    def with_time(self, hour, minute, second, microsecond=0):
-        """
-        Returns a new instance with the current time set to a different time.
-
-        :param hour: The hour
-        :type hour: int
-
-        :param minute: The minute
-        :type minute: int
-
-        :param second: The second
-        :type second: int
-
-        :param microsecond: The microsecond
-        :type microsecond: int
-
-        :rtype: Pendulum
-        """
-        warnings.warn(
-            'with_time() is deprecated. Use at() instead.',
-            category=DeprecationWarning,
-            stacklevel=2
-        )
-
-        return self.at(hour, minute, second, microsecond)
-
     def with_date_time(self, year, month, day, hour, minute, second, microsecond=0):
         """
         Return a new instance with the date and time set to the given values.

pendulum/time.py

@@ -252,7 +252,7 @@ def add(self, hours=0, minutes=0, seconds=0, microseconds=0):
         """
         from .pendulum import Pendulum
 
-        return Pendulum.EPOCH.with_time(
+        return Pendulum.EPOCH.at(
             self._hour, self._minute, self._second, self._microsecond
         ).add(
             hours=hours,
@@ -281,7 +281,7 @@ def subtract(self, hours=0, minutes=0, seconds=0, microseconds=0):
         """
         from .pendulum import Pendulum
 
-        return Pendulum.EPOCH.with_time(
+        return Pendulum.EPOCH.at(
             self._hour, self._minute, self._second, self._microsecond
         ).subtract(
             hours=hours,

pendulum/utils.py

@@ -7,14 +7,6 @@
 
 class InMethodsTest(AbstractTestCase):
 
-    def test_in_years(self):
-        it = Interval(days=365)
-        self.assertEqual(1, it.in_years())
-
-    def test_in_months(self):
-        it = Interval(days=75)
-        self.assertEqual(2, it.in_months())
-
     def test_in_weeks(self):
         it = Interval(days=17)
         self.assertEqual(2, it.in_weeks())

tests/interval_tests/test_in_methods.py

@@ -7,14 +7,6 @@
 
 class TotalMethodsTest(AbstractTestCase):
 
-    def test_total_years(self):
-        it = Interval(days=365)
-        self.assertEqual(1, it.total_years())
-
-    def test_in_months(self):
-        it = Interval(days=75)
-        self.assertEqual(2.5, it.total_months())
-
     def test_in_weeks(self):
         it = Interval(days=17)
         self.assertEqual(2.43, round(it.total_weeks(), 2))

tests/interval_tests/test_total_methods.py

@@ -8,41 +8,37 @@
 class CreateFromDateTest(AbstractTestCase):
 
     def test_create_from_date_with_defaults(self):
-        d = Pendulum.create_from_date()
-        self.assertEqual(d.timestamp, Pendulum.utcnow().with_time(0, 0, 0, 0).timestamp)
+        d = Pendulum.create()
+        self.assertEqual(d.timestamp, Pendulum.utcnow().at(0, 0, 0, 0).timestamp)
 
     def test_create_from_date(self):
-        d = Pendulum.create_from_date(1975, 12, 25)
+        d = Pendulum.create(1975, 12, 25)
         self.assertPendulum(d, 1975, 12, 25, 0, 0, 0)
 
     def test_create_from_date_with_year(self):
-        d = Pendulum.create_from_date(1975)
+        d = Pendulum.create(1975)
         self.assertEqual(d.year, 1975)
 
     def test_create_from_date_with_month(self):
-        d = Pendulum.create_from_date(None, 12)
-        self.assertEqual(d.month, 12)
-        d = Pendulum.create_from_date(month=12)
+        d = Pendulum.create(month=12)
         self.assertEqual(d.month, 12)
 
     def test_create_from_date_with_day(self):
-        d = Pendulum.create_from_date(None, None, 25)
-        self.assertEqual(d.day, 25)
-        d = Pendulum.create_from_date(day=25)
+        d = Pendulum.create(day=25)
         self.assertEqual(d.day, 25)
 
     def test_create_from_date_with_timezone_string(self):
-        d = Pendulum.create_from_date(1975, 12, 25, tz='Europe/London')
+        d = Pendulum.create(1975, 12, 25, tz='Europe/London')
         self.assertPendulum(d, 1975, 12, 25)
         self.assertEqual('Europe/London', d.timezone_name)
 
     def test_create_from_date_with_timezone(self):
-        d = Pendulum.create_from_date(1975, 12, 25, tz=timezone('Europe/London'))
+        d = Pendulum.create(1975, 12, 25, tz=timezone('Europe/London'))
         self.assertPendulum(d, 1975, 12, 25)
         self.assertEqual('Europe/London', d.timezone_name)
 
     def test_create_from_date_with_tzinfo(self):
         tz = timezone('Europe/London')
-        d = Pendulum.create_from_date(1975, 12, 25, tz=TimezoneInfo(tz, 3600, True, None, ''))
+        d = Pendulum.create(1975, 12, 25, tz=TimezoneInfo(tz, 3600, True, None, ''))
         self.assertPendulum(d, 1975, 12, 25)
         self.assertEqual('Europe/London', d.timezone_name)