replace old style string formatting with new format (#5)

* replace old style string formatting with new format

* update parenthesis mismatch

* update parenthesis mismatch

Author: kmario23

pendulum/pendulum.py

@@ -222,7 +222,7 @@ def parse(cls, time=None, tz=pytz.UTC):
         dt = dateparser.parse(time)
 
         if not dt:
-            raise PendulumException('Invalid time string "%s"' % time)
+            raise PendulumException('Invalid time string "{}"'.format(time))
 
         return cls(
             dt.year, dt.month, dt.day,
@@ -867,7 +867,7 @@ def format_locale(cls, locale):
         """
         m = re.match('([a-z]{2})[-_]([a-z]{2})', locale, re.I)
         if m:
-            return '%s_%s' % (m.group(1).lower(), m.group(2).lower())
+            return '{}_{}'.format(m.group(1).lower(), m.group(2).lower())
         else:
             return locale.lower()
 
@@ -942,7 +942,7 @@ def _strftime(self, m):
             else:
                 return {1: 'st', 2: 'nd', 3: 'rd'}.get(self.day % 10, "th")
 
-        raise ValueError('Unknown formatter %%%s' % fmt)
+        raise ValueError('Unknown formatter %%{}'.format(fmt))
 
     def __str__(self):
         if self._to_string_format is None:
@@ -1936,9 +1936,9 @@ def start_of(self, unit):
         :rtype: Pendulum
         """
         if unit not in self._MODIFIERS_VALID_UNITS:
-            raise ValueError('Invalid unit "%s" for start_of()' % unit)
+            raise ValueError('Invalid unit "{}" for start_of()'.format(unit))
 
-        return getattr(self, '_start_of_%s' % unit)()
+        return getattr(self, '_start_of_{}'.format(unit))()
 
     def end_of(self, unit):
         """
@@ -2148,9 +2148,9 @@ def first_of(self, unit, day_of_week=None):
         :rtype: Pendulum
         """
         if unit not in ['month', 'quarter', 'year']:
-            raise PendulumException('Invalid unit "%s" for first_of()' % unit)
+            raise PendulumException('Invalid unit "{}" for first_of()'.format(unit))
 
-        return getattr(self, '_first_of_%s' % unit)(day_of_week)
+        return getattr(self, '_first_of_{}'.format(unit))(day_of_week)
 
     def last_of(self, unit, day_of_week=None):
         """
@@ -2169,9 +2169,9 @@ def last_of(self, unit, day_of_week=None):
         :rtype: Pendulum
         """
         if unit not in ['month', 'quarter', 'year']:
-            raise PendulumException('Invalid unit "%s" for first_of()' % unit)
+            raise PendulumException('Invalid unit "{}" for first_of()'.format(unit))
 
-        return getattr(self, '_last_of_%s' % unit)(day_of_week)
+        return getattr(self, '_last_of_{}'.format(unit))(day_of_week)
 
     def nth_of(self, unit, nth, day_of_week):
         """
@@ -2193,12 +2193,12 @@ def nth_of(self, unit, nth, day_of_week):
         :rtype: Pendulum
         """
         if unit not in ['month', 'quarter', 'year']:
-            raise PendulumException('Invalid unit "%s" for first_of()' % unit)
+            raise PendulumException('Invalid unit "{}" for first_of()'.format(unit))
 
-        dt = getattr(self, '_nth_of_%s' % unit)(nth, day_of_week)
+        dt = getattr(self, '_nth_of_{}'.format(unit))(nth, day_of_week)
         if dt is False:
-            raise PendulumException('Unable to find occurence %d of %s in %s'
-                                    % (nth, self._days[day_of_week], unit))
+            raise PendulumException('Unable to find occurence {} of {} in {}'.format(
+                                     nth, self._days[day_of_week], unit))
 
         return dt
 
@@ -2440,7 +2440,7 @@ def _get_datetime(self, value, pendulum=False):
 
             return d._datetime
 
-        raise ValueError('Invalid datetime "%s"' % value)
+        raise ValueError('Invalid datetime "{}"'.format(value))
 
     def for_json(self):
         """

pendulum/translator.py

@@ -32,7 +32,7 @@ def _do_load_catalogue(self, locale):
                 )
         else:
             if not self.register_resource(locale):
-                raise NotFoundResourceException('Resource for locale "%s" could not be found' % locale)
+                raise NotFoundResourceException('Resource for locale "{}" could not be found'.format(locale))
 
             self._do_load_catalogue(locale)
 
@@ -48,7 +48,7 @@ def register_resource(self, locale):
         load_module('lang', root)
 
         # Loading locale
-        locale_mod = load_module('lang.%s' % locale, locale_file)
+        locale_mod = load_module('lang.{}'.format(locale), locale_file)
 
         self.add_resource('dict', locale_mod.translations, locale)
 

tests/pendulum_tests/test_getters.py

@@ -202,4 +202,4 @@ def is_same_day(self):
     def is_day_of_week(self):
         for i in Pendulum._days.values():
             d = Pendulum.now().next(getattr(Pendulum, i.upper()))
-            self.assertTrue(getattr(d, 'is_%s' % i.lower())())
+            self.assertTrue(getattr(d, 'is_{}s'.format(i.lower()))())