From ac6ca2de48116c6a68c787c2cd7fdaedf2f80755 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 18 Feb 2014 16:15:32 +0100
Subject: tests: fix remaining tests

---
 iso8601/iso8601.py      | 5 ++---
 iso8601/test_iso8601.py | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/iso8601/iso8601.py b/iso8601/iso8601.py
index b1a57e7..b72d7b4 100644
--- a/iso8601/iso8601.py
+++ b/iso8601/iso8601.py
@@ -53,10 +53,9 @@ ISO8601_REGEX = re.compile(
                     (?P<tz_minute>[0-9]{2}){0,1}
                 )
             ){0,1}
-        )
-        |
-        $
+        ){0,1}
     )
+    $
     """,
     re.VERBOSE
 )
diff --git a/iso8601/test_iso8601.py b/iso8601/test_iso8601.py
index 125f3c7..7f406b5 100644
--- a/iso8601/test_iso8601.py
+++ b/iso8601/test_iso8601.py
@@ -35,7 +35,7 @@ def test_parse_utc_different_default():
     ("131015T142533Z", "Unable to parse date string"),
     ("131015", "Unable to parse date string"),
     ("2007-06-23X06:40:34.00Z", "Unable to parse date string"),  # https://code.google.com/p/pyiso8601/issues/detail?id=14
-    # ("2007-06-23 06:40:34.00Zrubbish", "Unable to parse date string"),  # https://code.google.com/p/pyiso8601/issues/detail?id=14 FIXME
+    ("2007-06-23 06:40:34.00Zrubbish", "Unable to parse date string"),  # https://code.google.com/p/pyiso8601/issues/detail?id=14
     ("20114-01-03T01:45:49", "Unable to parse date string"),
 ])
 def test_parse_invalid_date(invalid_date, error_string):
@@ -50,7 +50,7 @@ def test_parse_invalid_date(invalid_date, error_string):
     ("2007-01-01T08:00:00", datetime.datetime(2007, 1, 1, 8, 0, 0, 0, iso8601.UTC), "2007-01-01T08:00:00+00:00"),  # Handle timezone-less dates. Assumes UTC. http://code.google.com/p/pyiso8601/issues/detail?id=4
     ("2006-10-20T15:34:56.123+02:30", datetime.datetime(2006, 10, 20, 15, 34, 56, 123000, iso8601.FixedOffset(2, 30, "+02:30")), None),
     ("2006-10-20T15:34:56Z", datetime.datetime(2006, 10, 20, 15, 34, 56, 0, iso8601.UTC), "2006-10-20T15:34:56+00:00"),
-    ("2007-5-7T11:43:55.328Z'", datetime.datetime(2007, 5, 7, 11, 43, 55, 328000, iso8601.UTC), "2007-05-07T11:43:55.328000+00:00"),  # http://code.google.com/p/pyiso8601/issues/detail?id=6
+    ("2007-5-7T11:43:55.328Z", datetime.datetime(2007, 5, 7, 11, 43, 55, 328000, iso8601.UTC), "2007-05-07T11:43:55.328000+00:00"),  # http://code.google.com/p/pyiso8601/issues/detail?id=6
     ("2006-10-20T15:34:56.123Z", datetime.datetime(2006, 10, 20, 15, 34, 56, 123000, iso8601.UTC), "2006-10-20T15:34:56.123000+00:00"),
     ("2013-10-15T18:30Z", datetime.datetime(2013, 10, 15, 18, 30, 0, 0, iso8601.UTC), "2013-10-15T18:30:00+00:00"),
     ("2013-10-15T22:30+04", datetime.datetime(2013, 10, 15, 22, 30, 0, 0, iso8601.FixedOffset(4, 0, "+04:00")), "2013-10-15T22:30:00+04:00"),  # <time>±hh:mm
-- 
cgit v1.2.1