Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-10 01:13:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into rename-error

Browse source 
# Conflicts:
#	beets/dbcore/query.py
This commit is contained in:
discopatrick 2017-04-22 18:13:03 +01:00
commit bd48559b0a
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
beets/dbcore/query.py
View file

@ -553,18 +553,17 @@ class Period(object):
"""
if not string:
return None
ordinal = string.count('-')
if ordinal >= len(cls.date_formats):
# Too many components.
raise InvalidQueryArgumentValueError(string,
'a valid datetime string')
date_format = cls.date_formats[ordinal]
try:
date = datetime.strptime(string, date_format)
except ValueError:
# Parsing failed.
raise InvalidQueryArgumentValueError(string,
'a valid datetime string')
date = None
for ordinal, date_format in enumerate(cls.date_formats):
try:
date = datetime.strptime(string, date_format)
break
except ValueError:
# Parsing failed.
pass
if date is None:
raise InvalidQueryArgumentTypeError(string,
'a valid datetime string')
precision = cls.precisions[ordinal]
return cls(date, precision)