Merge branch 'picture' into pretty

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 32a3af0..feb9974 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -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'