From 6d48dc65380f540f4471e5c890fcf27b2a240374 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 3 Apr 2012 11:24:57 +0200 Subject: [PATCH 1/1] use strict xml validator update wl api path --- apps/apiclient/settings.py | 2 +- apps/catalogue/models/book.py | 6 +++--- lib/librarian | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/apiclient/settings.py b/apps/apiclient/settings.py index 5fbf18ee..f1eb34a4 100755 --- a/apps/apiclient/settings.py +++ b/apps/apiclient/settings.py @@ -5,7 +5,7 @@ WL_CONSUMER_KEY = getattr(settings, 'APICLIENT_WL_CONSUMER_KEY', None) WL_CONSUMER_SECRET = getattr(settings, 'APICLIENT_WL_CONSUMER_SECRET', None) WL_API_URL = getattr(settings, 'APICLIENT_WL_API_URL', - 'http://www.wolnelektury.pl/api/') + 'http://wolnelektury.pl/api/') WL_REQUEST_TOKEN_URL = getattr(settings, 'APICLIENT_WL_REQUEST_TOKEN_URL', WL_API_URL + 'oauth/request_token/') diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index ca5ccc87..ade9a429 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -243,13 +243,13 @@ class Book(models.Model): from librarian import NoDublinCore, ParseError, ValidationError try: - bi = BookInfo.from_string(book_xml.encode('utf-8')) + bi = BookInfo.from_string(book_xml.encode('utf-8'), strict=True) except ParseError, e: - raise AssertionError(_('Invalid XML') + ': ' + str(e)) + raise AssertionError(_('Invalid XML') + ': ' + unicode(e)) except NoDublinCore: raise AssertionError(_('No Dublin Core found.')) except ValidationError, e: - raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e)) + raise AssertionError(_('Invalid Dublin Core') + ': ' + unicode(e)) valid_about = self.correct_about() assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about diff --git a/lib/librarian b/lib/librarian index 9e13b0c9..cdc27335 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 9e13b0c994e9d481008bef7006a74609adfd16f8 +Subproject commit cdc273354769f4add5f2a6e01d5526a6130a517d -- 2.20.1