Separates constants from Pendulum class

Author: sdispater

pendulum/__init__.py

@@ -5,22 +5,14 @@
 from .period import Period
 
 # Constants
-MONDAY = Pendulum.MONDAY
-TUESDAY = Pendulum.TUESDAY
-WEDNESDAY = Pendulum.WEDNESDAY
-THURSDAY = Pendulum.THURSDAY
-FRIDAY = Pendulum.FRIDAY
-SATURDAY = Pendulum.SATURDAY
-SUNDAY = Pendulum.SUNDAY
-
-YEARS_PER_CENTURY = Pendulum.YEARS_PER_CENTURY
-YEARS_PER_DECADE = Pendulum.YEARS_PER_DECADE
-MONTHS_PER_YEAR = Pendulum.MONTHS_PER_YEAR
-WEEKS_PER_YEAR = Pendulum.WEEKS_PER_YEAR
-DAYS_PER_WEEK = Pendulum.DAYS_PER_WEEK
-HOURS_PER_DAY = Pendulum.HOURS_PER_DAY
-MINUTES_PER_HOUR = Pendulum.MINUTES_PER_HOUR
-SECONDS_PER_MINUTE = Pendulum.SECONDS_PER_MINUTE
+from .constants import (
+    MONDAY, TUESDAY, WEDNESDAY,
+    THURSDAY, FRIDAY, SATURDAY, SUNDAY,
+    YEARS_PER_CENTURY, YEARS_PER_DECADE,
+    MONTHS_PER_YEAR, WEEKS_PER_YEAR, DAYS_PER_WEEK,
+    HOURS_PER_DAY, MINUTES_PER_HOUR, SECONDS_PER_MINUTE,
+    SECONDS_PER_HOUR, SECONDS_PER_DAY
+)
 
 # Helpers
 instance = Pendulum.instance

pendulum/constants.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+# The day constants
+SUNDAY = 0
+MONDAY = 1
+TUESDAY = 2
+WEDNESDAY = 3
+THURSDAY = 4
+FRIDAY = 5
+SATURDAY = 6
+
+# Number of X in Y.
+YEARS_PER_CENTURY = 100
+YEARS_PER_DECADE = 10
+MONTHS_PER_YEAR = 12
+WEEKS_PER_YEAR = 52
+DAYS_PER_WEEK = 7
+HOURS_PER_DAY = 24
+MINUTES_PER_HOUR = 60
+SECONDS_PER_MINUTE = 60
+SECONDS_PER_HOUR = MINUTES_PER_HOUR * SECONDS_PER_MINUTE
+SECONDS_PER_DAY = HOURS_PER_DAY * SECONDS_PER_HOUR
+
+# Formats
+ATOM = '%Y-%m-%dT%H:%M:%S%_z'
+COOKIE = '%A, %d-%b-%Y %H:%M:%S %Z'
+ISO8601 = '%Y-%m-%dT%H:%M:%S%_z'
+ISO8601_EXTENDED = '%Y-%m-%dT%H:%M:%S.%f%_z'
+RFC822 = '%a, %d %b %y %H:%M:%S %z'
+RFC850 = '%A, %d-%b-%y %H:%M:%S %Z'
+RFC1036 = '%a, %d %b %y %H:%M:%S %z'
+RFC1123 = '%a, %d %b %Y %H:%M:%S %z'
+RFC2822 = '%a, %d %b %Y %H:%M:%S %z'
+RFC3339 = '%Y-%m-%dT%H:%M:%S%_z'
+RFC3339_EXTENDED = '%Y-%m-%dT%H:%M:%S.%f%_z'
+RSS = '%a, %d %b %Y %H:%M:%S %z'
+W3C = '%Y-%m-%dT%H:%M:%S%_z'

pendulum/interval.py

@@ -6,6 +6,11 @@
     WordableIntervalMixin
 )
 
+from .constants import (
+    SECONDS_PER_DAY, SECONDS_PER_HOUR,
+    SECONDS_PER_MINUTE
+)
+
 
 def _divide_and_round(a, b):
     """divide a by b and round result to the nearest integer
@@ -56,19 +61,19 @@ def __new__(cls, days=0, seconds=0, microseconds=0,
             m = -1
 
         self._microseconds = round(total % 1 * 1e6)
-        self._seconds = abs(int(total)) % 86400 * m
-        self._days = abs(int(total)) // 86400 * m
+        self._seconds = abs(int(total)) % SECONDS_PER_DAY * m
+        self._days = abs(int(total)) // SECONDS_PER_DAY * m
 
         return self
 
     def total_minutes(self):
-        return self.total_seconds() / 60
+        return self.total_seconds() / SECONDS_PER_MINUTE
 
     def total_hours(self):
-        return self.total_seconds() / 3600
+        return self.total_seconds() / SECONDS_PER_HOUR
 
     def total_days(self):
-        return self.total_seconds() / 86400
+        return self.total_seconds() / SECONDS_PER_DAY
 
     def total_weeks(self):
         return self.total_days() / 7
@@ -296,7 +301,7 @@ def __new__(cls, days=0, seconds=0, microseconds=0,
         total = self.total_seconds()
 
         self._microseconds = abs(round(total % 1 * 1e6))
-        self._seconds = abs(int(total)) % 86400
-        self._days = abs(int(total)) // 86400
+        self._seconds = abs(int(total)) % SECONDS_PER_DAY
+        self._days = abs(int(total)) // SECONDS_PER_DAY
 
         return self

pendulum/pendulum.py

@@ -19,19 +19,17 @@
 from .tz import Timezone, UTC, FixedTimezone, local_timezone
 from .tz.timezone_info import TimezoneInfo
 from ._compat import PY33, basestring
+from .constants import (
+    SUNDAY, MONDAY, TUESDAY, WEDNESDAY,
+    THURSDAY, FRIDAY, SATURDAY,
+    YEARS_PER_CENTURY, YEARS_PER_DECADE,
+    MONTHS_PER_YEAR, DAYS_PER_WEEK,
+    MINUTES_PER_HOUR, SECONDS_PER_MINUTE
+)
 
 
 class Pendulum(datetime.datetime, TranslatableMixin):
 
-    # The day constants
-    SUNDAY = 0
-    MONDAY = 1
-    TUESDAY = 2
-    WEDNESDAY = 3
-    THURSDAY = 4
-    FRIDAY = 5
-    SATURDAY = 6
-
     # Names of days of the week
     _days = {
         SUNDAY: 'Sunday',
@@ -43,16 +41,6 @@ class Pendulum(datetime.datetime, TranslatableMixin):
         SATURDAY: 'Saturday'
     }
 
-    # Number of X in Y.
-    YEARS_PER_CENTURY = 100
-    YEARS_PER_DECADE = 10
-    MONTHS_PER_YEAR = 12
-    WEEKS_PER_YEAR = 52
-    DAYS_PER_WEEK = 7
-    HOURS_PER_DAY = 24
-    MINUTES_PER_HOUR = 60
-    SECONDS_PER_MINUTE = 60
-
     # Formats
     ATOM = '%Y-%m-%dT%H:%M:%S%_z'
     COOKIE = '%A, %d-%b-%Y %H:%M:%S %Z'
@@ -585,7 +573,7 @@ def float_timestamp(self):
 
     @property
     def week_of_month(self):
-        return math.ceil(self.day / self.DAYS_PER_WEEK)
+        return math.ceil(self.day / DAYS_PER_WEEK)
 
     @property
     def age(self):
@@ -602,8 +590,8 @@ def offset(self):
     @property
     def offset_hours(self):
         return (self.get_offset()
-                   / self.SECONDS_PER_MINUTE
-                   / self.MINUTES_PER_HOUR)
+                   / SECONDS_PER_MINUTE
+                   / MINUTES_PER_HOUR)
 
     @property
     def local(self):
@@ -1351,55 +1339,55 @@ def is_sunday(self):
 
         :rtype: bool
         """
-        return self.day_of_week == self.SUNDAY
+        return self.day_of_week == SUNDAY
 
     def is_monday(self):
         """
         Checks if this day is a monday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.MONDAY
+        return self.day_of_week == MONDAY
 
     def is_tuesday(self):
         """
         Checks if this day is a tuesday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.TUESDAY
+        return self.day_of_week == TUESDAY
 
     def is_wednesday(self):
         """
         Checks if this day is a wednesday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.WEDNESDAY
+        return self.day_of_week == WEDNESDAY
 
     def is_thursday(self):
         """
         Checks if this day is a thursday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.THURSDAY
+        return self.day_of_week == THURSDAY
 
     def is_friday(self):
         """
         Checks if this day is a friday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.FRIDAY
+        return self.day_of_week == FRIDAY
 
     def is_saturday(self):
         """
         Checks if this day is a saturday.
 
         :rtype: bool
         """
-        return self.day_of_week == self.SATURDAY
+        return self.day_of_week == SATURDAY
 
     def is_birthday(self, dt=None):
         """
@@ -1743,7 +1731,7 @@ def _start_of_decade(self):
 
         :rtype: Pendulum
         """
-        year = self.year - self.year % self.YEARS_PER_DECADE
+        year = self.year - self.year % YEARS_PER_DECADE
         return self.with_date_time(year, 1, 1, 0, 0, 0)
 
     def _end_of_decade(self):
@@ -1753,7 +1741,7 @@ def _end_of_decade(self):
 
         :rtype: Pendulum
         """
-        year = self.year - self.year % self.YEARS_PER_DECADE + self.YEARS_PER_DECADE - 1
+        year = self.year - self.year % YEARS_PER_DECADE + YEARS_PER_DECADE - 1
 
         return self.with_date_time(
             year, 12, 31, 23, 59, 59, 999999
@@ -1766,7 +1754,7 @@ def _start_of_century(self):
 
         :rtype: Pendulum
         """
-        year = self.year - 1 - (self.year - 1) % self.YEARS_PER_CENTURY + 1
+        year = self.year - 1 - (self.year - 1) % YEARS_PER_CENTURY + 1
 
         return self.with_date_time(year, 1, 1, 0, 0, 0)
 
@@ -1777,7 +1765,7 @@ def _end_of_century(self):
 
         :rtype: Pendulum
         """
-        year = self.year - 1 - (self.year - 1) % self.YEARS_PER_CENTURY + self.YEARS_PER_CENTURY
+        year = self.year - 1 - (self.year - 1) % YEARS_PER_CENTURY + YEARS_PER_CENTURY
 
         return self.with_date_time(
             year, 12, 31, 23, 59, 59, 999999
@@ -2084,7 +2072,7 @@ def _last_of_year(self, day_of_week=None):
 
         :rtype: Pendulum
         """
-        return self.month_(self.MONTHS_PER_YEAR).last_of('month', day_of_week)
+        return self.month_(MONTHS_PER_YEAR).last_of('month', day_of_week)
 
     def _nth_of_year(self, nth, day_of_week):
         """