set language

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 9fe0c52..42bc518 100644 (file)
--- 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
         """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
         >>> 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:
 
         """
         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)
 
         """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."""
         """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)
 
 
         return self.by_slug_and_lang(wluri.slug, wluri.language)