A lot of ignoretz is working!

TZ support in Rust kinda sucks though.

src/lib.rs

@@ -776,8 +776,8 @@ impl Parser {
         let naive = self.build_naive(&res, &default_ts);
 
         if !ignoretz {
-            let offset = self.build_tzaware(&naive, &res, &default_ts);
+            let offset = self.build_tzaware(&naive, &res, &default_ts)?;
-            Ok((naive, offset.unwrap(), tokens))
+            Ok((naive, offset, tokens))
         } else {
             Ok((naive, None, tokens))
         }
@@ -1010,12 +1010,15 @@ impl Parser {
         default: &NaiveDateTime,
     ) -> ParseResult<Option<FixedOffset>> {
         // TODO: Actual timezone support
-        if res.tzname.is_none() && res.tzoffset.is_none() || res.tzname == Some(" ".to_owned())
+        if let Some(offset) = res.tzoffset {
-            || res.tzname == Some(".".to_owned())
+            Ok(Some(FixedOffset::east(offset)))
+        } else if res.tzoffset == None
+            && (res.tzname == Some(" ".to_owned()) || res.tzname == Some(".".to_owned())
+                || res.tzname == Some("-".to_owned()) || res.tzname == None)
         {
             Ok(None)
         } else {
-            println!("Tzname: {:?}, Tzoffset: {:?}", res.tzname, res.tzoffset);
+            println!("{:?}, {:?}", res.tzname, res.tzoffset);
             Err(ParseError::TimezoneUnsupported)
         }
     }

tests/compat.rs

@@ -45,6 +45,21 @@ fn test_split() {
     test_split!(py, t, "19990101T2359");
 }
 
+macro_rules! py_offset_secs {
+    ($py:ident, $dt:expr) => ({
+        let float: f32 = $dt.getattr($py, "tzinfo")
+            .expect("Unable to get `tzinfo` value")
+            .getattr($py, "_offset")
+            .expect("Unable to get `_offset` value")
+            .call_method0($py, "total_seconds")
+            .expect("Unable to call total_seconds()")
+            .extract($py)
+            .expect("Unable to extract total_seconds()");
+
+        float as i32
+    });
+}
+
 macro_rules! test_parse {
     // Full parsing options
     (
@@ -70,6 +85,7 @@ macro_rules! test_parse {
         let mut kwargs = HashMap::new();
         kwargs.insert("default", default_pydate);
         kwargs.insert("tzinfos", default_tzinfos.into());
+        kwargs.insert("ignoretz", PyBool::new($py, $ignoretz).into());
 
         let py_true = PyBool::new($py, true);
         if $dayfirst == Some(true) {
@@ -94,19 +110,29 @@ macro_rules! test_parse {
             $fuzzy_with_tokens,
             $default,
             $ignoretz,
-            $tzinfos).expect("Unable to parse date in Rust");
+            $tzinfos).expect(&format!("Unable to parse date in Rust '{}'", $s));
 
-        if let Some(_offset) = rs_parsed.1 {
+        if let Some(tzoffset) = rs_parsed.1 {
-            // TODO: Handle tests involving timezones
+            // Make sure the offsets are correct, and then normalize the naive date
+            // to match the aware date
+            let offset_secs = py_offset_secs!($py, py_parsed);
+
+            // TODO: Should I be using utc_minus_local instead?
+            assert_eq!(offset_secs, tzoffset.local_minus_utc(), "Mismatched tzoffset for '{}'", $s);
         } else {
-            // Naive timestamps
-            let rs_dt = rs_parsed.0;
-
             // First make sure that Python doesn't have any timestamps set
             let py_tzoffset = py_parsed
                 .getattr($py, "tzinfo")
                 .expect("Unable to get `tzinfo` value");
-            assert_eq!(py_tzoffset, $py.None());
+            
+            if py_tzoffset != $py.None() {
+                let offset_secs = py_offset_secs!($py, py_parsed);
+                assert!(false, "Tzinfo had value {} when dtparse didn't detect timezone for '{}'", offset_secs, $s);
+            }
+        }
+
+        // Naive timestamps
+        let rs_dt = rs_parsed.0;
 
         // TODO: Should years by i32?
         let py_year: i32 = py_parsed
@@ -162,7 +188,6 @@ macro_rules! test_parse {
             "Mismatched microsecond for '{}'",
             $s
         );
-        }
     };
 
     (
@@ -214,7 +239,7 @@ macro_rules! test_parse_yearfirst {
 }
 
 macro_rules! test_parse_dayfirst {
-    ($py:ident, $parser:ident, $datetime:ident,$s:expr) => {
+    ($py:ident, $parser:ident, $datetime:ident, $s:expr) => {
         let info = ParserInfo::default();
         let default_rsdate = &NaiveDate::from_ymd(2003, 9, 25).and_hms(0, 0, 0);
 
@@ -235,6 +260,28 @@ macro_rules! test_parse_dayfirst {
     };
 }
 
+macro_rules! test_parse_ignoretz {
+    ($py:ident, $parser:ident, $datetime:ident, $s:expr) => {
+        let info = ParserInfo::default();
+        let default_rsdate = &NaiveDate::from_ymd(2003, 9, 25).and_hms(0, 0, 0);
+
+        test_parse!(
+            $py,
+            $parser,
+            $datetime,
+            info,
+            $s,
+            None,
+            None,
+            false,
+            false,
+            Some(default_rsdate),
+            true,
+            vec![]
+        );
+    };
+}
+
 #[test]
 fn test_dateutil_compat() {
     let gil = Python::acquire_gil();
@@ -272,9 +319,10 @@ fn test_dateutil_compat() {
     // testDateCommandFormatStrip12
     test_parse!(py, parser, datetime, "2003");
     // testDateRCommandFormat
-    // test_parse!(py, parser, datetime, "Thu, 25 Sep 2003 10:49:41 -0300");
+    test_parse!(py, parser, datetime, "Thu, 25 Sep 2003 10:49:41 -0300");
     // testISOFormat
     // test_parse!(py, parser, datetime, "2003-09-25T10:49:41.5-03:00");
+    // TODO: tzoffset not properly recognized
     // testISOFormatStrip1
     // test_parse!(py, parser, datetime, "2003-09-25T10:49:41-03:00");
     // testISOFormatStrip2
@@ -287,6 +335,7 @@ fn test_dateutil_compat() {
     test_parse!(py, parser, datetime, "2003-09-25");
     // testISOStrippedFormat
     // test_parse!(py, parser, datetime, "20030925T104941.5-0300");
+    // TODO: More than three YMD values
     // testISOStrippedFormatStrip1
     // test_parse!(py, parser, datetime, "20030925T104941-0300");
     // testISOStrippedFormatStrip2
@@ -440,20 +489,24 @@ fn test_dateutil_compat() {
 
     // testRandomFormat1
     test_parse!(py, parser, datetime, "Wed, July 10, '96");
-    // testRandomFormat2 - Needs ignoretz
+    // TODO: TZ support (PDT is unrecognized)
+    // testRandomFormat2
     // test_parse_ignoretz!(py, parser, datetime, "1996.07.10 AD at 15:08:56 PDT");
 
     // testRandomFormat3
     test_parse!(py, parser, datetime, "1996.July.10 AD 12:08 PM");
 
-    // testRandomFormat4 - Needs ignoretz
+    // TODO: UnrecognizedToken("PST")
+    // testRandomFormat4
     // test_parse_ignoretz!(py, parser, datetime, "Tuesday, April 12, 1952 AD 3:30:42pm PST");
-    // testRandomFormat5 - Needs ignoretz
+    // TODO: UnrecognizedToken("EST")
+    // testRandomFormat5
     // test_parse_ignoretz!(py, parser, datetime, "November 5, 1994, 8:15:30 am EST");
-    // testRandomFormat6 - Needs ignoretz
+    // TODO: Parse error - finds hour 5 instead of 8
+    // testRandomFormat6
     // test_parse_ignoretz!(py, parser, datetime, "1994-11-05T08:15:30-05:00");
-    // testRandomFormat7 - Needs ignoretz
+    // testRandomFormat7
-    // test_parse_ignoretz!(py, parser, datetime, "1994-11-05T08:15:30Z");
+    test_parse_ignoretz!(py, parser, datetime, "1994-11-05T08:15:30Z");
     // testRandomFormat8
     test_parse!(py, parser, datetime, "July 4, 1976");
     // testRandomFormat9
@@ -471,7 +524,7 @@ fn test_dateutil_compat() {
     // testRandomFormat15; NB: testRandomFormat16 is exactly the same
     test_parse!(py, parser, datetime, "0:01:02 on July 4, 1976");
     // testRandomFormat17 - Needs ignoretz
-    // test_parse_ignoretz!(py, parser, datetime, "1976-07-04T00:01:02Z");
+    test_parse_ignoretz!(py, parser, datetime, "1976-07-04T00:01:02Z");
     // testRandomFormat18
     test_parse!(py, parser, datetime, "July 4, 1976 12:01:02 am");
     // testRandomFormat19