fnp
/
librarian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ae38fc5
)
remove "import *"
author
Jan Szejko
<jan.szejko@gmail.com>
Mon, 11 Apr 2016 15:33:49 +0000
(17:33 +0200)
committer
Jan Szejko
<jan.szejko@gmail.com>
Mon, 11 Apr 2016 15:33:49 +0000
(17:33 +0200)
librarian/picture.py
patch
|
blob
|
history
diff --git
a/librarian/picture.py
b/librarian/picture.py
index
dbbb4de
..
1aa1d07
100644
(file)
--- a/
librarian/picture.py
+++ b/
librarian/picture.py
@@
-1,4
+1,6
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
+from operator import and_
+
from dcparser import Field, WorkInfo, DCNS
from librarian import (RDFNS, ValidationError, NoDublinCore, ParseError, WLURI)
from xml.parsers.expat import ExpatError
from dcparser import Field, WorkInfo, DCNS
from librarian import (RDFNS, ValidationError, NoDublinCore, ParseError, WLURI)
from xml.parsers.expat import ExpatError
@@
-7,8
+9,6
@@
from StringIO import StringIO
from lxml import etree
from lxml.etree import (XMLSyntaxError, XSLTApplyError, Element)
import re
from lxml import etree
from lxml.etree import (XMLSyntaxError, XSLTApplyError, Element)
import re
-from functools import *
-from operator import *
class WLPictureURI(WLURI):
class WLPictureURI(WLURI):
@@
-96,6
+96,7
@@
class WLPicture(object):
self.picture_info = PictureInfo.from_element(self.rdf_elem)
else:
self.picture_info = None
self.picture_info = PictureInfo.from_element(self.rdf_elem)
else:
self.picture_info = None
+ self.frame = None
@classmethod
def from_string(cls, xml, *args, **kwargs):
@classmethod
def from_string(cls, xml, *args, **kwargs):