From 1ef711e917631630c1a64cd7cf1cc461a3fe2920 Mon Sep 17 00:00:00 2001 From: Mahmoud Hashemi Date: Fri, 3 Apr 2015 01:13:10 -0700 Subject: [PATCH] remove timeutils dependency on strutils --- boltons/timeutils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/boltons/timeutils.py b/boltons/timeutils.py index 24a2d50..63e46ef 100644 --- a/boltons/timeutils.py +++ b/boltons/timeutils.py @@ -13,7 +13,6 @@ import re import bisect import datetime from datetime import timedelta -from strutils import cardinalize __all__ = ['total_seconds', 'parse_td', 'relative_time', @@ -101,6 +100,14 @@ def parse_timedelta(text): parse_td = parse_timedelta # legacy alias +def _cardinalize_time_unit(unit, value): + # remove dep on strutils + # all time units cardinalize normally + if value == 1: + return unit + return unit + 's' + + def decimal_relative_time(d, other=None, ndigits=0): """Get a tuple representing the relative time difference between two :class:`datetime` objects or one :class:`datetime` and now. @@ -138,7 +145,7 @@ def decimal_relative_time(d, other=None, ndigits=0): bbound, bunit, bname = _BOUNDS[b_idx] f_diff = diff_seconds / total_seconds(bunit) rounded_diff = round(f_diff, ndigits) - return rounded_diff, cardinalize(bname, abs(rounded_diff)) + return rounded_diff, _cardinalize_time_unit(bname, abs(rounded_diff)) def relative_time(d, other=None, ndigits=0):