X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/3f007696b61ee78291def21c0dca98f94524a943..c7734daf3d6884c358f1644c1f8f7970453fafb1:/tests/test_dcparser.py?ds=sidebyside diff --git a/tests/test_dcparser.py b/tests/test_dcparser.py index 7af573e..64e98d7 100644 --- a/tests/test_dcparser.py +++ b/tests/test_dcparser.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- # -# Copyright © 2008,2009,2010 Fundacja Nowoczesna Polska -# # This file is part of Librarian, licensed under GNU Affero GPLv3 or later. -# For full license text see COPYING or +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from __future__ import unicode_literals from librarian import dcparser from lxml import etree @@ -12,12 +11,13 @@ from nose.tools import * from os.path import splitext from tests.utils import get_all_fixtures import codecs +from datetime import date def check_dcparser(xml_file, result_file): - xml = file(xml_file).read() + xml = open(xml_file, 'rb').read() result = codecs.open(result_file, encoding='utf-8').read() - info = dcparser.BookInfo.from_string(xml).to_dict() + info = dcparser.BookInfo.from_bytes(xml).to_dict() should_be = eval(result) for key in should_be: assert_equals(info[key], should_be[key]) @@ -30,13 +30,13 @@ def test_dcparser(): def check_serialize(xml_file): - xml = file(xml_file).read() - info = dcparser.BookInfo.from_string(xml) + xml = open(xml_file, 'rb').read() + info = dcparser.BookInfo.from_bytes(xml) # serialize - serialized = etree.tostring(info.to_etree(), encoding=unicode).encode('utf-8') + serialized = etree.tostring(info.to_etree(), encoding='unicode').encode('utf-8') # then parse again - info_bis = dcparser.BookInfo.from_string(serialized) + info_bis = dcparser.BookInfo.from_bytes(serialized) # check if they are the same for key in vars(info): @@ -48,4 +48,3 @@ def check_serialize(xml_file): def test_serialize(): for fixture in get_all_fixtures('dcparser', '*.xml'): yield check_serialize, fixture -