diff options
| author | Linus Wallgren <linus.wallgren@scypho.com> | 2015-07-01 16:30:13 +0200 |
|---|---|---|
| committer | Linus Wallgren <linus.wallgren@scypho.com> | 2015-07-01 16:30:13 +0200 |
| commit | b12ca60ddafcc0dec35a994d44f8597ffdce8cea (patch) | |
| tree | d0cbbdd1fd2d69689a488bd76c29f293e390269b | |
| parent | 89be258e2df5380a2f6d0d791630ebf84f4fd40e (diff) | |
| download | pyiso8601-b12ca60ddafcc0dec35a994d44f8597ffdce8cea.tar.gz | |
Add support for , as separator for fractional part
| -rw-r--r-- | iso8601/iso8601.py | 2 | ||||
| -rw-r--r-- | iso8601/test_iso8601.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/iso8601/iso8601.py b/iso8601/iso8601.py index 1ae810a..396b2a9 100644 --- a/iso8601/iso8601.py +++ b/iso8601/iso8601.py @@ -52,7 +52,7 @@ ISO8601_REGEX = re.compile( (:{0,1}(?P<minute>[0-9]{2})){0,1} ( :{0,1}(?P<second>[0-9]{1,2}) - (\.(?P<second_fraction>[0-9]+)){0,1} + ([.,](?P<second_fraction>[0-9]+)){0,1} ){0,1} (?P<timezone> Z diff --git a/iso8601/test_iso8601.py b/iso8601/test_iso8601.py index ed2d45a..bc5e763 100644 --- a/iso8601/test_iso8601.py +++ b/iso8601/test_iso8601.py @@ -77,6 +77,7 @@ def test_parse_invalid_date(invalid_date, error_string): ("1997-08-29T06:14:00.000123Z", datetime.datetime(1997, 8, 29, 6, 14, 0, 123, iso8601.UTC), "1997-08-29T06:14:00.000123+00:00"), # https://bitbucket.org/micktwomey/pyiso8601/issue/9/regression-parsing-microseconds ("2014-02", datetime.datetime(2014, 2, 1, 0, 0, 0, 0, iso8601.UTC), "2014-02-01T00:00:00+00:00"), # https://bitbucket.org/micktwomey/pyiso8601/issue/14/regression-yyyy-mm-no-longer-parses ("2014", datetime.datetime(2014, 1, 1, 0, 0, 0, 0, iso8601.UTC), "2014-01-01T00:00:00+00:00"), # YYYY + ("1997-08-29T06:14:00,000123Z", datetime.datetime(1997, 8, 29, 6, 14, 0, 123, iso8601.UTC), "1997-08-29T06:14:00.000123+00:00"), # Use , as decimal separator ]) def test_parse_valid_date(valid_date, expected_datetime, isoformat): parsed = iso8601.parse_date(valid_date) |