X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=1081a93680c7dc1d054748bcffd68cca50cf6b28;hb=696d49815e082402be65c4f120397b4695477279;hp=e40b367c255719046bf2d5dd2fd63bc6bb2e4d8a;hpb=9afa6ede21dbc3ccacf49e843bbd58f86268daf5;p=youtube-dl diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index e40b367c2..1081a9368 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -827,6 +827,7 @@ def unified_strdate(date_str): '%b %dnd %Y %I:%M%p', '%b %dth %Y %I:%M%p', '%Y-%m-%d', + '%Y/%m/%d', '%d.%m.%Y', '%d/%m/%Y', '%Y/%m/%d %H:%M:%S', @@ -1273,9 +1274,15 @@ def int_or_none(v, scale=1, default=None, get_attr=None, invscale=1): if get_attr: if v is not None: v = getattr(v, get_attr, None) + if v == '': + v = None return default if v is None else (int(v) * invscale // scale) +def str_or_none(v, default=None): + return default if v is None else compat_str(v) + + def str_to_int(int_str): if int_str is None: return None