fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Librarian in regular requirements.
[redakcja.git]
/
apps
/
catalogue
/
models
/
book.py
diff --git
a/apps/catalogue/models/book.py
b/apps/catalogue/models/book.py
index
0239673
..
1fcd05a
100755
(executable)
--- a/
apps/catalogue/models/book.py
+++ b/
apps/catalogue/models/book.py
@@
-339,7
+339,7
@@
class Book(models.Model):
from librarian.dcparser import BookInfo
from librarian import NoDublinCore, ParseError, ValidationError
try:
from librarian.dcparser import BookInfo
from librarian import NoDublinCore, ParseError, ValidationError
try:
- return BookInfo.from_
string
(book_xml.encode('utf-8'))
+ return BookInfo.from_
bytes
(book_xml.encode('utf-8'))
except (self.NoTextError, ParseError, NoDublinCore, ValidationError):
return None
except (self.NoTextError, ParseError, NoDublinCore, ValidationError):
return None
@@
-416,8
+416,8
@@
class Book(models.Model):
from catalogue.ebook_utils import RedakcjaDocProvider
from librarian.parser import WLDocument
from catalogue.ebook_utils import RedakcjaDocProvider
from librarian.parser import WLDocument
- return WLDocument.from_
string
(
- self.materialize(publishable=publishable, changes=changes),
+ return WLDocument.from_
bytes
(
+ self.materialize(publishable=publishable, changes=changes)
.encode('utf-8')
,
provider=RedakcjaDocProvider(publishable=publishable),
parse_dublincore=parse_dublincore,
strict=strict)
provider=RedakcjaDocProvider(publishable=publishable),
parse_dublincore=parse_dublincore,
strict=strict)