Fix timestamps parsing tests

Author: waveform80

structa/conversions.py

@@ -165,7 +165,7 @@ def parse_timestamp(s):
     return parse(s)
 
 
-def parse_duration_or_timestamp(s, duration_type=relativedelta):
+def parse_duration_or_timestamp(s, delta_type=relativedelta):
     """
     Convert the string *s* to a :class:`~datetime.datetime` or a
     :class:`~dateutil.relativedelta.relativedelta` (or
@@ -174,6 +174,6 @@ def parse_duration_or_timestamp(s, duration_type=relativedelta):
     attempted. A :exc:`ValueError` is raised if both conversions fail.
     """
     try:
-        return parse_duration(s, duration_type=duration_type)
+        return parse_duration(s, delta_type=delta_type)
     except ValueError:
         return parse_timestamp(s)

structa/ui/cli.py

@@ -18,10 +18,14 @@
 
 from ..analyzer import Analyzer
 from ..errors import ValidationWarning
-from ..conversions import parse_duration_or_timestamp, parse_timestamp
 from ..types import sources_list, SourcesList
 from ..source import Source
 from ..xml import xml, get_transform
+from ..conversions import (
+    parse_duration,
+    parse_duration_or_timestamp,
+    parse_timestamp,
+)
 
 try:
     import argcomplete
@@ -360,7 +364,7 @@ def max_timestamp(s, now=_start):
 
 def timestamps(s):
     try:
-        unit, epoch = {
+        return {
             # The Excel epoch is defined as 1900-01-01, but that is date "1"
             # in Excel, rather than "0". Furthermore, for compat. with good
             # ol' 1-2-3, 1900 was treated (incorrectly) as a leap-year leading

tests/test_cli.py

@@ -35,10 +35,15 @@ def test_max_timestamp():
     assert cli.max_timestamp('10 years') == cli._start + relativedelta(years=10)
 
 
-def test_epoch():
-    assert cli.epoch('unix') == dt.datetime(1970, 1, 1)
-    assert cli.epoch('excel') == dt.datetime(1899, 12, 30)
-    assert cli.epoch('2015-03-31 00:00:00') == dt.datetime(2015, 3, 31)
+def test_timestamps():
+    assert cli.timestamps('unix') == (
+        dt.timedelta(seconds=1), dt.datetime(1970, 1, 1))
+    assert cli.timestamps('excel') == (
+        dt.timedelta(days=1), dt.datetime(1899, 12, 30))
+    assert cli.timestamps('2015-03-31 00:00:00') == (
+        dt.timedelta(seconds=1), dt.datetime(2015, 3, 31))
+    assert cli.timestamps('milliseconds since 1900-01-01') == (
+        dt.timedelta(milliseconds=1), dt.datetime(1900, 1, 1))
 
 
 def test_num():

tests/test_types.py

@@ -664,14 +664,14 @@ def test_num_repr():
         dt.datetime.utcfromtimestamp(1),
         dt.datetime.utcfromtimestamp(86400),
     ))), pattern=(Int, 1, 0))
-    assert str(pattern) == 'int seconds after 1970-01-01 of datetime range=1970-01-01 00:00:00..1970-01-02 00:00:00'
+    assert str(pattern) == 'int seconds since 1970-01-01 of datetime range=1970-01-01 00:00:00..1970-01-02 00:00:00'
     assert xml(pattern).tag == 'intof'
     pattern = NumRepr(DateTime(Counter((
         dt.datetime.utcfromtimestamp(0.0),
         dt.datetime.utcfromtimestamp(1.0),
         dt.datetime.utcfromtimestamp(86400.0),
     ))), pattern=(Float, 1, 0))
-    assert str(pattern) == 'float seconds after 1970-01-01 of datetime range=1970-01-01 00:00:00..1970-01-02 00:00:00'
+    assert str(pattern) == 'float seconds since 1970-01-01 of datetime range=1970-01-01 00:00:00..1970-01-02 00:00:00'
     assert xml(pattern).tag == 'floatof'
     assert pattern == pattern + pattern
     assert pattern + pattern == pattern