X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a34b95aa7ba5fd4838541d1cdcd28358fb808062..fb1bbfe622abeaaea2a2dfc459d8b779b2d369a2:/librarian/__init__.py diff --git a/librarian/__init__.py b/librarian/__init__.py index dd09ce4..616e351 100644 --- a/librarian/__init__.py +++ b/librarian/__init__.py @@ -9,23 +9,31 @@ import os import re import shutil -class ParseError(Exception): +class UnicodeException(Exception): def __str__(self): """ Dirty workaround for Python Unicode handling problems. """ - return self.message + return unicode(self).encode('utf-8') def __unicode__(self): """ Dirty workaround for Python Unicode handling problems. """ - return self.message + args = self.args[0] if len(self.args) == 1 else self.args + try: + message = unicode(args) + except UnicodeDecodeError: + message = unicode(args, encoding='utf-8', errors='ignore') + return message + +class ParseError(UnicodeException): + pass -class ValidationError(Exception): +class ValidationError(UnicodeException): pass class NoDublinCore(ValidationError): """There's no DublinCore section, and it's required.""" pass -class NoProvider(Exception): +class NoProvider(UnicodeException): """There's no DocProvider specified, and it's needed.""" pass @@ -70,7 +78,7 @@ class WLURI(object): slug = None example = 'http://wolnelektury.pl/katalog/lektura/template/' - _re_wl_uri = re.compile('http://wolnelektury.pl/katalog/lektura/' + _re_wl_uri = re.compile(r'http://(www\.)?wolnelektury.pl/katalog/lektura/' '(?P[-a-z0-9]+)/?$') def __init__(self, uri): @@ -82,8 +90,8 @@ class WLURI(object): def strict(cls, uri): match = cls._re_wl_uri.match(uri) if not match: - raise ValueError('Supplied URI (%s) does not match ' - 'the template: %s.' % (uri, cls._re_wl_uri)) + raise ValidationError(u'Invalid URI (%s). Should match: %s' % ( + uri, cls._re_wl_uri.pattern)) return cls(uri) @classmethod