From 0cc669a13f211a270f097f235f2bcc4163dcc251 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas@paradise.net.nz>
Date: Sat, 3 Oct 2009 21:41:43 +1300
Subject: [PATCH] call a spine a spine, and quieter testing

---
 epub.py                |  4 ++--
 tests/_epub.py         |  2 +-
 tests/_test_content.py | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epub.py b/epub.py
index 9027487..49f0af2 100644
--- a/epub.py
+++ b/epub.py
@@ -149,7 +149,7 @@ class Epub(object):
 
         self.metadata = parse_metadata(metadata)
         self.manifest = parse_manifest(manifest, pwd)
-        ncxid, self.order = parse_spine(spine)
+        ncxid, self.spine = parse_spine(spine)
         self.ncxfile = self.manifest[ncxid][0]
 
     def parse_ncx(self):
@@ -161,7 +161,7 @@ class Epub(object):
         data = {
             'metadata': self.metadata,
             'manifest': self.manifest,
-            'spine': self.order,
+            'spine': self.spine,
             'ncx': self.ncxdata
             }
         return dumps(data, indent=2)
diff --git a/tests/_epub.py b/tests/_epub.py
index f5f44e7..d36b81f 100644
--- a/tests/_epub.py
+++ b/tests/_epub.py
@@ -122,7 +122,7 @@ def test_opf():
 
         for a, t in [('metadata', dict),
                      ('manifest', dict),
-                     ('order', list),
+                     ('spine', list),
                      ('ncxfile', basestring),
             ]:
             assert hasattr(e, a)
diff --git a/tests/_test_content.py b/tests/_test_content.py
index b3f0056..28c7b98 100755
--- a/tests/_test_content.py
+++ b/tests/_test_content.py
@@ -30,7 +30,7 @@ OK_TAGS = [
 
 def _xhtml_parse(*args, **kwargs):
     kwargs['parser'] = lxml.html.XHTMLParser(encoding="utf-8")
-    
+
     return lxml.html.parse(*args, **kwargs)
 
 def _html_parse(*args, **kwargs):
@@ -43,12 +43,12 @@ def test_tags(parse=_html_parse):
     good_tags = dict((x, 0) for x in OK_TAGS)
     bad_tags = {}
     for book in TEST_FILES:
-        print book
+        #print book
         e = _load_epub(book, verbose=True)
         e.parse_meta()
         e.parse_opf()
         #e.parse_ncx()
-        for ID in e.order:
+        for ID in e.spine:
             try:
                 tree = e.gettree(id=ID, parse=parse)
             except Exception, exc:
@@ -115,21 +115,21 @@ def add_marker(doc, ID, title=None, klass="espri-marker"):
 
 def concat_books():
     for book in TEST_FILES:
-        print book
+        #print book
         e = _load_epub(book, verbose=True)
         e.parse_meta()
         e.parse_opf()
         e.parse_ncx()
         lang = e.find_language() or 'UND'
         doc = epub.new_doc(lang=lang)
-        for ID in e.order:
+        for ID in e.spine:
             fn, mimetype = e.manifest[ID]
             print fn
             if mimetype.startswith('image'):
                 tree = epub.new_doc(guts='<img src="%s" alt="" />' % fn)
             else:
                 tree = e.gettree(fn, parse=_html_parse)
-                
+
             add_marker(doc, 'espri-new-page-%s' % ID, fn)
             add_guts(tree, doc)
 
@@ -140,7 +140,7 @@ def concat_books():
 
 def test_concat():
     for book in TEST_FILES:
-        print book
+        #print book
         e = _load_epub(book, verbose=True)
         e.parse_meta()
         e.parse_opf()
-- 
2.11.4.GIT