Merge pull request #107 from hugovk/26-disambiguate-naturaldate-returns

Disambiguate naturaldate return: only append year if more than ~5 months away
python-humanize · Feb 24, 2020 · b28d9ad · b28d9ad
2 parents 002d531 + 1afc39e
commit b28d9ad
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/humanize/time.py b/src/humanize/time.py
@@ -196,8 +196,8 @@ def naturalday(value, format="%b %d"):
 
 
 def naturaldate(value):
-    """Like naturalday, but will append a year for dates that are a year
-    ago or more."""
+    """Like naturalday, but append a year for dates more than about five months away.
+    """
     try:
         value = dt.date(value.year, value.month, value.day)
     except AttributeError:
@@ -207,6 +207,6 @@ def naturaldate(value):
         # Date arguments out of range
         return value
     delta = abs_timedelta(value - dt.date.today())
-    if delta.days >= 365:
+    if delta.days >= 5 * 365 / 12:
         return naturalday(value, "%b %d %Y")
     return naturalday(value)
diff --git a/tests/test_time.py b/tests/test_time.py
@@ -234,13 +234,13 @@ def test_naturalday(test_args, expected):
         (VALUE_ERROR_TEST, VALUE_ERROR_TEST),
         (OVERFLOW_ERROR_TEST, OVERFLOW_ERROR_TEST),
         (dt.date(2019, 2, 2), "Feb 02 2019"),
-        (dt.date(2019, 3, 2), "Mar 02"),
-        (dt.date(2019, 4, 2), "Apr 02"),
-        (dt.date(2019, 5, 2), "May 02"),
-        (dt.date(2019, 6, 2), "Jun 02"),
-        (dt.date(2019, 7, 2), "Jul 02"),
-        (dt.date(2019, 8, 2), "Aug 02"),
-        (dt.date(2019, 9, 2), "Sep 02"),
+        (dt.date(2019, 3, 2), "Mar 02 2019"),
+        (dt.date(2019, 4, 2), "Apr 02 2019"),
+        (dt.date(2019, 5, 2), "May 02 2019"),
+        (dt.date(2019, 6, 2), "Jun 02 2019"),
+        (dt.date(2019, 7, 2), "Jul 02 2019"),
+        (dt.date(2019, 8, 2), "Aug 02 2019"),
+        (dt.date(2019, 9, 2), "Sep 02 2019"),
         (dt.date(2019, 10, 2), "Oct 02"),
         (dt.date(2019, 11, 2), "Nov 02"),
         (dt.date(2019, 12, 2), "Dec 02"),
@@ -251,12 +251,12 @@ def test_naturalday(test_args, expected):
         (dt.date(2020, 5, 2), "May 02"),
         (dt.date(2020, 6, 2), "Jun 02"),
         (dt.date(2020, 7, 2), "Jul 02"),
-        (dt.date(2020, 8, 2), "Aug 02"),
-        (dt.date(2020, 9, 2), "Sep 02"),
-        (dt.date(2020, 10, 2), "Oct 02"),
-        (dt.date(2020, 11, 2), "Nov 02"),
-        (dt.date(2020, 12, 2), "Dec 02"),
-        (dt.date(2021, 1, 2), "Jan 02"),
+        (dt.date(2020, 8, 2), "Aug 02 2020"),
+        (dt.date(2020, 9, 2), "Sep 02 2020"),
+        (dt.date(2020, 10, 2), "Oct 02 2020"),
+        (dt.date(2020, 11, 2), "Nov 02 2020"),
+        (dt.date(2020, 12, 2), "Dec 02 2020"),
+        (dt.date(2021, 1, 2), "Jan 02 2021"),
         (dt.date(2021, 2, 2), "Feb 02 2021"),
     ],
 )