Fixed parsing.

Fixes #88

Author: sdispater

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed parsing, especially for strings in the form `31-01-01`.
+
+
 ## [1.0.0]
 
 ### Changed
@@ -302,6 +309,7 @@ This version causes major breaking API changes to simplify it and making it more
 Initial release
 
 
+[Unreleased]: https://github.com/sdispater/pendulum/compare/1.0.0...master
 [1.0.0]: https://github.com/sdispater/pendulum/releases/tag/1.0.0
 [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

pendulum/parsing/parser.py

@@ -22,7 +22,7 @@ class Parser(object):
         '        (?P<year>\d{4})'  # Year
         '        (?P<monthday>'
         '            (?P<monthsep>-|/)?(?P<month>\d{2})'  # Month (optional)
-        '            ((?:-|/)?(?P<day>\d{1,2}))?'  # Day (optional)
+        '            ((?P<daysep>-|/)?(?P<day>\d{1,2}))?'  # Day (optional)
         '        )?'
         '    )'
         '    |'
@@ -56,6 +56,7 @@ class Parser(object):
 
     DEFAULT_OPTIONS = {
         'day_first': False,
+        'year_first': True,
         'strict': False,
         'now': None
     }
@@ -92,11 +93,14 @@ def parse_common(self, text):
                 if m.group('isocalendar'):
                     # We have a ISO 8601 string defined
                     # by week number
-                    date = self._get_iso_8601_week(
-                        m.group('isoyear'),
-                        m.group('isoweek'),
-                        m.group('isoweekday')
-                    )
+                    try:
+                        date = self._get_iso_8601_week(
+                            m.group('isoyear'),
+                            m.group('isoweek'),
+                            m.group('isoweekday')
+                        )
+                    except ValueError:
+                        raise ParserError('Invalid date string: {}'.format(text))
 
                     year = date['year']
                     month = date['month']
@@ -112,7 +116,7 @@ def parse_common(self, text):
                     else:
                         if m.group('month') and m.group('day'):
                             # Month and day
-                            if len(m.group('day')) == 1:
+                            if not m.group('daysep') and len(m.group('day')) == 1:
                                 # Ordinal day
                                 dt = datetime.strptime(
                                     '{}-{}'.format(year, m.group('month') + m.group('day')),
@@ -277,7 +281,11 @@ def _parse(self, text):
         # We couldn't parse the string
         # so we fallback on the dateutil parser
         try:
-            dt = parser.parse(text, dayfirst=self._options['day_first'])
+            dt = parser.parse(
+                text,
+                dayfirst=self._options['day_first'],
+                yearfirst=self._options['year_first']
+            )
         except ValueError:
             raise ParserError('Invalid date string: {}'.format(text))
 

tests/parsing_test/test_parser.py

@@ -500,7 +500,64 @@ def test_strict(self):
         self.assertEqual(5, parsed['second'])
         self.assertEqual(0, parsed['subsecond'])
 
+    def test_edge_cases(self):
+        text = '2013-11-1'
+
+        parsed = Parser().parse(text)
+        self.assertEqual(2013, parsed['year'])
+        self.assertEqual(11, parsed['month'])
+        self.assertEqual(1, parsed['day'])
+        self.assertEqual(0, parsed['hour'])
+        self.assertEqual(0, parsed['minute'])
+        self.assertEqual(0, parsed['second'])
+        self.assertEqual(0, parsed['subsecond'])
+        self.assertEqual(None, parsed['offset'])
+
+        text = '10-01-01'
+
+        parsed = Parser().parse(text)
+        self.assertEqual(2010, parsed['year'])
+        self.assertEqual(1, parsed['month'])
+        self.assertEqual(1, parsed['day'])
+        self.assertEqual(0, parsed['hour'])
+        self.assertEqual(0, parsed['minute'])
+        self.assertEqual(0, parsed['second'])
+        self.assertEqual(0, parsed['subsecond'])
+        self.assertEqual(None, parsed['offset'])
+
+        text = '31-01-01'
+
+        parsed = Parser().parse(text)
+        self.assertEqual(2031, parsed['year'])
+        self.assertEqual(1, parsed['month'])
+        self.assertEqual(1, parsed['day'])
+        self.assertEqual(0, parsed['hour'])
+        self.assertEqual(0, parsed['minute'])
+        self.assertEqual(0, parsed['second'])
+        self.assertEqual(0, parsed['subsecond'])
+        self.assertEqual(None, parsed['offset'])
+
+        text = '32-01-01'
+
+        parsed = Parser().parse(text)
+        self.assertEqual(2032, parsed['year'])
+        self.assertEqual(1, parsed['month'])
+        self.assertEqual(1, parsed['day'])
+        self.assertEqual(0, parsed['hour'])
+        self.assertEqual(0, parsed['minute'])
+        self.assertEqual(0, parsed['second'])
+        self.assertEqual(0, parsed['subsecond'])
+        self.assertEqual(None, parsed['offset'])
+
     def test_invalid(self):
         text = '201610T'
 
         self.assertRaises(ParserError, Parser().parse, text)
+
+        text = '2012-W54'
+
+        self.assertRaises(ParserError, Parser().parse, text)
+
+        text = '2012-W13-8'
+
+        self.assertRaises(ParserError, Parser().parse, text)