测试gitnore

venv/Lib/site-packages/django/utils/timesince.py

@@ -6,21 +6,21 @@ from django.utils.timezone import is_aware, utc
 from django.utils.translation import gettext, ngettext_lazy
 
 TIME_STRINGS = {
-    "year": ngettext_lazy("%(num)d year", "%(num)d years", "num"),
-    "month": ngettext_lazy("%(num)d month", "%(num)d months", "num"),
-    "week": ngettext_lazy("%(num)d week", "%(num)d weeks", "num"),
-    "day": ngettext_lazy("%(num)d day", "%(num)d days", "num"),
-    "hour": ngettext_lazy("%(num)d hour", "%(num)d hours", "num"),
-    "minute": ngettext_lazy("%(num)d minute", "%(num)d minutes", "num"),
+    'year': ngettext_lazy('%d year', '%d years'),
+    'month': ngettext_lazy('%d month', '%d months'),
+    'week': ngettext_lazy('%d week', '%d weeks'),
+    'day': ngettext_lazy('%d day', '%d days'),
+    'hour': ngettext_lazy('%d hour', '%d hours'),
+    'minute': ngettext_lazy('%d minute', '%d minutes'),
 }
 
 TIMESINCE_CHUNKS = (
-    (60 * 60 * 24 * 365, "year"),
-    (60 * 60 * 24 * 30, "month"),
-    (60 * 60 * 24 * 7, "week"),
-    (60 * 60 * 24, "day"),
-    (60 * 60, "hour"),
-    (60, "minute"),
+    (60 * 60 * 24 * 365, 'year'),
+    (60 * 60 * 24 * 30, 'month'),
+    (60 * 60 * 24 * 7, 'week'),
+    (60 * 60 * 24, 'day'),
+    (60 * 60, 'hour'),
+    (60, 'minute'),
 )
 
 
@@ -47,7 +47,7 @@ def timesince(d, now=None, reversed=False, time_strings=None, depth=2):
     if time_strings is None:
         time_strings = TIME_STRINGS
     if depth <= 0:
-        raise ValueError("depth must be greater than 0.")
+        raise ValueError('depth must be greater than 0.')
     # Convert datetime.date to datetime.datetime for comparison.
     if not isinstance(d, datetime.datetime):
         d = datetime.datetime(d.year, d.month, d.day)
@@ -73,13 +73,13 @@ def timesince(d, now=None, reversed=False, time_strings=None, depth=2):
     since = delta.days * 24 * 60 * 60 + delta.seconds
     if since <= 0:
         # d is in the future compared to now, stop processing.
-        return avoid_wrapping(time_strings["minute"] % {"num": 0})
+        return avoid_wrapping(time_strings['minute'] % 0)
     for i, (seconds, name) in enumerate(TIMESINCE_CHUNKS):
         count = since // seconds
         if count != 0:
             break
     else:
-        return avoid_wrapping(time_strings["minute"] % {"num": 0})
+        return avoid_wrapping(time_strings['minute'] % 0)
     result = []
     current_depth = 0
     while i < len(TIMESINCE_CHUNKS) and current_depth < depth:
@@ -87,11 +87,11 @@ def timesince(d, now=None, reversed=False, time_strings=None, depth=2):
         count = since // seconds
         if count == 0:
             break
-        result.append(avoid_wrapping(time_strings[name] % {"num": count}))
+        result.append(avoid_wrapping(time_strings[name] % count))
         since -= seconds * count
         current_depth += 1
         i += 1
-    return gettext(", ").join(result)
+    return gettext(', ').join(result)
 
 
 def timeuntil(d, now=None, time_strings=None, depth=2):