minor fixes

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index bf41c7a..430fb7e 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -80,7 +80,7 @@ class WLURI(object):
     slug = None
 
     example = 'http://edukacjamedialna.edu.pl/'
-    _re_wl_uri = re.compile(r'http://(www\.)?edukacjamedialna.edu.pl/'
+    _re_wl_uri = re.compile(r'http://(www\.)?edukacjamedialna.edu.pl/(lekcje/)?'
             '(?P<slug>[-a-z0-9]+)/?$')
 
     def __init__(self, uri):
@@ -124,11 +124,11 @@ class DocProvider(object):
     """
 
     def by_slug(self, slug):
-        """Should return a file-like object with a WL document XML."""
+        """Should return an IOFile object with a WL document XML."""
         raise NotImplementedError
 
     def by_uri(self, uri, wluri=WLURI):
-        """Should return a file-like object with a WL document XML."""
+        """Should return an IOFile object with a WL document XML."""
         wluri = wluri(uri)
         return self.by_slug(wluri.slug)
 
@@ -142,7 +142,7 @@ class DirDocProvider(DocProvider):
 
     def by_slug(self, slug):
         fname = slug + '.xml'
-        return open(os.path.join(self.dir, fname))
+        return IOFile.from_filename(os.path.join(self.dir, fname))
 
 
 import lxml.etree as etree