X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/716a9ab552bffbb7df2cb31ae41ee196902c7653..86becb1ae4d215dd782dfc054471d724f6dcd1d7:/src/librarian/picture.py diff --git a/src/librarian/picture.py b/src/librarian/picture.py index eeb8e8e..113cece 100644 --- a/src/librarian/picture.py +++ b/src/librarian/picture.py @@ -17,11 +17,7 @@ class WLPictureURI(WLURI): _re_wl_uri = re.compile( 'http://wolnelektury.pl/katalog/obraz/(?P[-a-z0-9]+)/?$' ) - - @classmethod - def from_slug(cls, slug): - uri = 'http://wolnelektury.pl/katalog/obraz/%s/' % slug - return cls(uri) + template = 'http://wolnelektury.pl/katalog/obraz/%s/' def as_wlpictureuri_strict(text): @@ -181,7 +177,9 @@ class WLPicture(object): return [[0, 0], [-1, -1]] def has_all_props(node, props): - return reduce(and_, map(lambda prop: prop in node.attrib, props)) + return six.moves.reduce( + and_, map(lambda prop: prop in node.attrib, props) + ) if not has_all_props(area, ['x1', 'x2', 'y1', 'y2']): return None @@ -228,7 +226,7 @@ class WLPicture(object): clip = self.get_sem_coords(k) self.frame = clip frm = Element("sem", {"type": "frame"}) - frm.append(k.iter("div").next()) + frm.append(next(k.iter("div"))) self.edoc.getroot().append(frm) k.getparent().remove(k) else: