Fix some formatter’s tokens handling

Author: sdispater

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - Fixed handling of `pytz` timezones.
+- Fixed some formatter's tokens handling.
 
 
 ## [2.0.2] - 2018-05-29

pendulum/formatting/formatter.py

@@ -96,6 +96,9 @@ class Formatter:
         # Day of Week
         'd': lambda dt: '{:d}'.format(dt.day_of_week),
 
+        # Day of ISO Week
+        'E': lambda dt: '{:d}'.format(dt.isoweekday()),
+
         # Hour
         'HH': lambda dt: '{:02d}'.format(dt.hour),
         'H': lambda dt: '{:d}'.format(dt.hour),
@@ -321,7 +324,9 @@ def _format_localizable_token(self, dt, token, locale):
             return locale.get('translations.months.abbreviated')[dt.month]
         elif token == 'MMMM':
             return locale.get('translations.months.wide')[dt.month]
-        elif token in ('dd', 'ddd'):
+        elif token == 'dd':
+            return locale.get('translations.days.short')[dt.day_of_week]
+        elif token == 'ddd':
             return locale.get('translations.days.abbreviated')[dt.day_of_week]
         elif token == 'dddd':
             return locale.get('translations.days.wide')[dt.day_of_week]

tests/formatting/test_formatter.py

@@ -9,7 +9,7 @@
 @pytest.fixture(autouse=True)
 def setup():
     Locale._cache['dummy'] = {}
-    
+
     yield
 
     del Locale._cache['dummy']
@@ -100,17 +100,23 @@ def test_day_of_week():
     d = pendulum.datetime(2016, 8, 28)
     assert f.format(d, 'd') == '0'
 
-    assert f.format(d, 'dd') == 'Sun'
+    assert f.format(d, 'dd') == 'Su'
     assert f.format(d, 'ddd') == 'Sun'
     assert f.format(d, 'dddd') == 'Sunday'
 
-    assert f.format(d, 'dd', locale='fr') == 'dim.'
+    assert f.format(d, 'dd', locale='fr') == 'di'
     assert f.format(d, 'ddd', locale='fr') == 'dim.'
     assert f.format(d, 'dddd', locale='fr') == 'dimanche'
 
     assert f.format(d, 'do') == '0th'
 
 
+def test_day_of_iso_week():
+    f = Formatter()
+    d = pendulum.datetime(2016, 8, 28)
+    assert f.format(d, 'E') == '7'
+
+
 def test_am_pm():
     f = Formatter()
     d = pendulum.datetime(2016, 8, 28, 23)