X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fmeta.py;h=ac5948ab82e1a5aef1cdf247578ee84dca3e2133;hb=HEAD;hp=f118e82dcfd19c7dce1b3d426ff2c6dd0c08485c;hpb=37dd60538984a3917354b794a5c96b0a025f8e95;p=mpd-sima.git diff --git a/sima/lib/meta.py b/sima/lib/meta.py index f118e82..ac5948a 100644 --- a/sima/lib/meta.py +++ b/sima/lib/meta.py @@ -26,6 +26,9 @@ from collections.abc import Set import logging import re +from ..utils.utils import MPDSimaException + + UUID_RE = r'^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[89AB][a-f0-9]{3}-[a-f0-9]{12}$' #: The Track Object is collapsing multiple tags into a single string using this # separator. It is used then to split back the string to tags list. @@ -44,7 +47,7 @@ def is_uuid4(uuid): return False -class MetaException(Exception): +class MetaException(MPDSimaException): """Generic Meta Exception""" @@ -94,8 +97,7 @@ class Meta: raise MetaException('Need a "name" argument (str type)') if not isinstance(kwargs.get('name'), str): raise MetaException('"name" argument not a string') - else: - self.__name = kwargs.pop('name').split(SEPARATOR)[0] + self.__name = kwargs.pop('name').split(SEPARATOR)[0] if 'mbid' in kwargs and kwargs.get('mbid'): mbid = kwargs.get('mbid').lower().split(SEPARATOR)[0] if is_uuid4(mbid): @@ -145,7 +147,7 @@ class Meta: if callable(other.__str__) and other.__str__() != self.name: self.__aliases |= {other.__str__()} else: - raise MetaException('No __str__ method found in {!r}'.format(other)) + raise MetaException(f'No __str__ method found in {other!r}') @property def name(self):