X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/edbda465ca1fceabe219d5caea95d513d61c6976..00906f2fc0432cede204c7870e6caecf427d7024:/librarian/__init__.py?ds=sidebyside diff --git a/librarian/__init__.py b/librarian/__init__.py index 9fe0c52..feb9974 100644 --- a/librarian/__init__.py +++ b/librarian/__init__.py @@ -92,9 +92,9 @@ class WLURI(object): """Contructs an URI from slug and language code. >>> WLURI.from_slug_and_lang('a-slug', WLURI.DEFAULT_LANGUAGE).uri - 'http://wolnelektury.pl/katalog/lektura/a-slug/' + u'http://wolnelektury.pl/katalog/lektura/a-slug/' >>> WLURI.from_slug_and_lang('a-slug', 'deu').uri - 'http://wolnelektury.pl/katalog/lektura/a-slug/deu/' + u'http://wolnelektury.pl/katalog/lektura/a-slug/deu/' """ if lang is None: @@ -138,9 +138,9 @@ class DocProvider(object): """Should return a file-like object with a WL document XML.""" return self.by_slug_and_lang(slug) - def by_uri(self, uri): + def by_uri(self, uri, wluri=WLURI): """Should return a file-like object with a WL document XML.""" - wluri = WLURI(uri) + wluri = wluri(uri) return self.by_slug_and_lang(wluri.slug, wluri.language) @@ -150,7 +150,6 @@ class DirDocProvider(DocProvider): def __init__(self, dir_): self.dir = dir_ self.files = {} - return super(DirDocProvider, self).__init__() def by_slug_and_lang(self, slug, lang=None): fname = WLURI.from_slug_and_lang(slug, lang).filename_stem() + '.xml'