From e34477da9357dddf53d6e76eecae9c46119c8039 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 8 Oct 2013 16:17:27 +0530 Subject: [PATCH] Get linear attrib for spine names as well --- src/calibre/ebooks/oeb/polish/container.py | 6 +++--- src/calibre/ebooks/oeb/polish/tests/container.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/oeb/polish/container.py b/src/calibre/ebooks/oeb/polish/container.py index b1cdcac955..4151773c10 100644 --- a/src/calibre/ebooks/oeb/polish/container.py +++ b/src/calibre/ebooks/oeb/polish/container.py @@ -319,15 +319,15 @@ class Container(object): # {{{ path = self.name_path_map.get(name, None) if path: if item.get('linear', 'yes') == 'yes': - yield name + yield name, True else: non_linear.append(name) for name in non_linear: - yield name + yield name, False @property def spine_items(self): - for name in self.spine_names: + for name, linear in self.spine_names: yield self.name_path_map[name] def remove_item(self, name): diff --git a/src/calibre/ebooks/oeb/polish/tests/container.py b/src/calibre/ebooks/oeb/polish/tests/container.py index 6dedaff365..e65f25fe6f 100644 --- a/src/calibre/ebooks/oeb/polish/tests/container.py +++ b/src/calibre/ebooks/oeb/polish/tests/container.py @@ -35,7 +35,7 @@ class ContainerTests(BaseTest): self.assertIn(name, c2.name_path_map) self.assertEqual(c1.open(name).read(), c2.open(name).read(), 'The file %s differs' % name) - spine_names = tuple(c1.spine_names) + spine_names = tuple(x[0] for x in c1.spine_names) text = spine_names[0] root = c2.parsed(text) root.xpath('//*[local-name()="body"]')[0].set('id', 'changed id for test')