diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index e229ffb766..d284beca3b 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -292,7 +292,6 @@ from calibre.ebooks.oeb.output import OEBOutput from calibre.ebooks.epub.output import EPUBOutput from calibre.ebooks.txt.output import TXTOutput from calibre.ebooks.pdf.output import PDFOutput -from calibre.ebooks.pdb.ereader.output import EREADEROutput from calibre.customize.profiles import input_profiles, output_profiles from calibre.devices.prs500.driver import PRS500 @@ -307,7 +306,7 @@ from calibre.devices.jetbook.driver import JETBOOK plugins = [HTML2ZIP, EPUBInput, MOBIInput, PDBInput, PDFInput, HTMLInput, TXTInput, OEBOutput, TXTOutput, PDFOutput, LITInput, ComicInput, - FB2Input, ODTInput, RTFInput, EPUBOutput, EREADEROutput, RecipeInput] + FB2Input, ODTInput, RTFInput, EPUBOutput, RecipeInput] plugins += [PRS505, PRS700, CYBOOKG3, KINDLE, KINDLE2, BLACKBERRY, EB600, \ JETBOOK] plugins += [x for x in list(locals().values()) if isinstance(x, type) and \ diff --git a/src/calibre/ebooks/pdb/ereader/reader.py b/src/calibre/ebooks/pdb/ereader/reader.py index d36e01ed69..9b5fbf82da 100644 --- a/src/calibre/ebooks/pdb/ereader/reader.py +++ b/src/calibre/ebooks/pdb/ereader/reader.py @@ -15,7 +15,7 @@ from calibre.ebooks import DRMError from calibre.ebooks.metadata import MetaInformation from calibre.ebooks.pdb.formatreader import FormatReader from calibre.ebooks.pdb.ereader import EreaderError -from calibre.ebooks.pdb.ereader.pmlconverter import pml_to_html, \ +from calibre.ebooks.pml.pmlconverter import pml_to_html, \ footnote_sidebar_to_html from calibre.ebooks.mobi.palmdoc import decompress_doc from calibre.ebooks.metadata.opf2 import OPFCreator diff --git a/src/calibre/ebooks/pdb/ereader/writer.py b/src/calibre/ebooks/pdb/ereader/writer.py index 7e3fdc30ea..55d3993171 100644 --- a/src/calibre/ebooks/pdb/ereader/writer.py +++ b/src/calibre/ebooks/pdb/ereader/writer.py @@ -11,7 +11,7 @@ import Image, cStringIO from calibre.ebooks.oeb.base import OEB_IMAGES from calibre.ebooks.pdb.header import PdbHeaderBuilder from calibre.ebooks.pdb.ereader import image_name -from calibre.ebooks.pdb.ereader.pmlconverter import html_to_pml +from calibre.ebooks.pml.pmlconverter import html_to_pml IDENTITY = 'PNPdPPrs' diff --git a/src/calibre/ebooks/pdb/ereader/pmlconverter.py b/src/calibre/ebooks/pml/pmlconverter.py similarity index 100% rename from src/calibre/ebooks/pdb/ereader/pmlconverter.py rename to src/calibre/ebooks/pml/pmlconverter.py