From 8ca77820b6e2095b05036acbe20009ec3719829b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 16 Jun 2016 12:32:02 +0530 Subject: [PATCH] ... --- src/calibre/ebooks/metadata/opf2.py | 7 +------ src/calibre/ebooks/metadata/utils.py | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index c51d7be5e8..27d748cc31 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -16,7 +16,7 @@ from lxml import etree from calibre.ebooks import escape_xpath_attr from calibre.constants import __appname__, __version__, filesystem_encoding from calibre.ebooks.metadata.toc import TOC -from calibre.ebooks.metadata.utils import parse_opf +from calibre.ebooks.metadata.utils import parse_opf, pretty_print_opf as _pretty_print from calibre.ebooks.metadata import string_to_authors, MetaInformation, check_isbn from calibre.ebooks.metadata.book.base import Metadata from calibre.utils.date import parse_date, isoformat @@ -38,11 +38,6 @@ class PrettyPrint(object): pretty_print_opf = False pretty_print = PrettyPrint() -def _pretty_print(root): - from calibre.ebooks.oeb.polish.pretty import pretty_opf, pretty_xml_tree - pretty_opf(root) - pretty_xml_tree(root) - class Resource(object): # {{{ ''' diff --git a/src/calibre/ebooks/metadata/utils.py b/src/calibre/ebooks/metadata/utils.py index fdad83e6d5..6e021defda 100644 --- a/src/calibre/ebooks/metadata/utils.py +++ b/src/calibre/ebooks/metadata/utils.py @@ -73,3 +73,8 @@ def create_manifest_item(root, href_template, id_template, media_type=None): i.set('media-type', media_type or guess_type(href_template)) manifest.append(i) return i + +def pretty_print_opf(root): + from calibre.ebooks.oeb.polish.pretty import pretty_opf, pretty_xml_tree + pretty_opf(root) + pretty_xml_tree(root)