More delay load optimizations. Time taken to import all builtin plugins now reduced by 60% from before I started.

src/calibre/customize/builtins.py

@@ -1645,3 +1645,33 @@ class StoreZixoStore(StoreBase):
 
 # }}}
 
+if __name__ == '__main__':
+    # Test load speed
+    import subprocess, textwrap
+    try:
+        subprocess.check_call(['python', '-c', textwrap.dedent(
+        '''
+        from __future__ import print_function
+        import time, sys, init_calibre
+        st = time.time()
+        import calibre.customize.builtins
+        t = time.time() - st
+        ret = 0
+
+        for x in ('lxml', 'calibre.ebooks.BeautifulSoup', 'uuid',
+            'calibre.utils.terminfo', 'calibre.utils.magick', 'PIL', 'Image',
+            'sqlite3', 'mechanize', 'httplib', 'xml'):
+            if x in sys.modules:
+                ret = 1
+                print (x, 'has been loaded by a plugin')
+        if ret:
+            print ('\\nA good way to trackdown what is loading something is to run'
+            ' python -c "import init_calibre; import calibre.customize.builtins"')
+            print()
+        print ('Time taken to import all plugins: %.2f'%t)
+        sys.exit(ret)
+
+        ''')])
+    except subprocess.CalledProcessError:
+        raise SystemExit(1)
+

src/calibre/customize/profiles.py

@@ -5,7 +5,6 @@
 __docformat__ = 'restructuredtext en'
 
 from itertools import izip
-from xml.sax.saxutils import escape
 
 from calibre.customize import Plugin as _Plugin
 
@@ -268,6 +267,7 @@ class OutputProfile(Plugin):
 
     @classmethod
     def tags_to_string(cls, tags):
+        from xml.sax.saxutils import escape
         return escape(', '.join(tags))
 
 class iPadOutput(OutputProfile):

src/calibre/devices/kobo/bookmark.py

@@ -7,7 +7,6 @@
 import os
 from contextlib import closing
 
-import sqlite3 as sqlite
 
 class Bookmark(): # {{{
     '''
@@ -32,7 +31,7 @@ def __init__(self, db_path, contentid, path, id, book_format, bookmark_extension
 
     def get_bookmark_data(self):
         ''' Return the timestamp and last_read_location '''
-
+        import sqlite3 as sqlite
         user_notes = {}
         self.timestamp = os.path.getmtime(self.path)
         with closing(sqlite.connect(self.db_path)) as connection:

src/calibre/devices/kobo/driver.py

@@ -6,7 +6,6 @@
 __docformat__ = 'restructuredtext en'
 
 import os, time, calendar
-import sqlite3 as sqlite
 from contextlib import closing
 from calibre.devices.usbms.books import BookList
 from calibre.devices.kobo.books import Book
@@ -16,7 +15,6 @@
 from calibre.devices.usbms.driver import USBMS, debug_print
 from calibre import prints
 from calibre.devices.usbms.books import CollectionsBookList
-from calibre.utils.magick.draw import save_cover_data_to
 from calibre.ptempfile import PersistentTemporaryFile
 
 class KOBO(USBMS):
@@ -230,6 +228,7 @@ def update_booklist(prefix, path, title, authors, mime, date, ContentType, Image
                 traceback.print_exc()
             return changed
 
+        import sqlite3 as sqlite
         with closing(sqlite.connect(
             self.normalize_path(self._main_prefix +
                 '.kobo/KoboReader.sqlite'))) as connection:
@@ -344,6 +343,7 @@ def delete_via_sql(self, ContentID, ContentType):
         #    2) volume_shorcover
         #    2) content
 
+        import sqlite3 as sqlite
         debug_print('delete_via_sql: ContentID: ', ContentID, 'ContentType: ', ContentType)
         with closing(sqlite.connect(self.normalize_path(self._main_prefix +
             '.kobo/KoboReader.sqlite'))) as connection:
@@ -739,6 +739,8 @@ def update_device_database_collections(self, booklists, collections_attributes,
         # Needs to be outside books collection as in the case of removing
         # the last book from the collection the list of books is empty
         # and the removal of the last book would not occur
+
+        import sqlite3 as sqlite
         with closing(sqlite.connect(self.normalize_path(self._main_prefix +
             '.kobo/KoboReader.sqlite'))) as connection:
 
@@ -850,6 +852,7 @@ def upload_cover(self, path, filename, metadata, filepath):
             debug_print('FAILED to upload cover', filepath)
 
     def _upload_cover(self, path, filename, metadata, filepath, uploadgrayscale):
+        from calibre.utils.magick.draw import save_cover_data_to
         if metadata.cover:
             cover = self.normalize_path(metadata.cover.replace('/', os.sep))
 
@@ -859,6 +862,7 @@ def _upload_cover(self, path, filename, metadata, filepath, uploadgrayscale):
                 ContentType = self.get_content_type_from_extension(extension) if extension != '' else self.get_content_type_from_path(filepath)
                 ContentID = self.contentid_from_path(filepath, ContentType)
 
+                import sqlite3 as sqlite
                 with closing(sqlite.connect(self.normalize_path(self._main_prefix +
                     '.kobo/KoboReader.sqlite'))) as connection:
 

src/calibre/devices/prst1/driver.py

@@ -12,8 +12,6 @@
 '''
 
 import os, time, re
-import sqlite3 as sqlite
-from sqlite3 import DatabaseError
 from contextlib import closing
 from datetime import date
 
@@ -146,6 +144,8 @@ def can_handle(self, devinfo, debug=False):
         return True
 
     def books(self, oncard=None, end_session=True):
+        import sqlite3 as sqlite
+
         dummy_bl = BookList(None, None, None)
 
         if (
@@ -246,6 +246,8 @@ def sync_booklists(self, booklists, end_session=True):
         debug_print('PRST1: finished sync_booklists')
 
     def update_device_database(self, booklist, collections_attributes, oncard):
+        import sqlite3 as sqlite
+
         debug_print('PRST1: starting update_device_database')
 
         plugboard = None
@@ -274,6 +276,8 @@ def update_device_database(self, booklist, collections_attributes, oncard):
 
     def update_device_books(self, connection, booklist, source_id, plugboard,
             dbpath):
+        from sqlite3 import DatabaseError
+
         opts = self.settings()
         upload_covers = opts.extra_customization[self.OPT_UPLOAD_COVERS]
         refresh_covers = opts.extra_customization[self.OPT_REFRESH_COVERS]
@@ -489,6 +493,8 @@ def rebuild_collections(self, booklist, oncard):
         debug_print('PRS-T1: finished rebuild_collections')
 
     def upload_cover(self, path, filename, metadata, filepath):
+        import sqlite3 as sqlite
+
         debug_print('PRS-T1: uploading cover')
 
         if filepath.startswith(self._main_prefix):

src/calibre/ebooks/chardet.py

@@ -8,7 +8,6 @@
 __docformat__ = 'restructuredtext en'
 
 import re, codecs
-from chardet import detect
 
 ENCODING_PATS = [
                  re.compile(r'<\?[^<>]+encoding\s*=\s*[\'"](.*?)[\'"][^<>]*>',
@@ -34,8 +33,13 @@ def substitute_entites(raw):
 _CHARSET_ALIASES = { "macintosh" : "mac-roman",
                         "x-sjis" : "shift-jis" }
 
+def detect(*args, **kwargs):
+    from chardet import detect
+    return detect(*args, **kwargs)
+
 def force_encoding(raw, verbose, assume_utf8=False):
     from calibre.constants import preferred_encoding
+
     try:
         chardet = detect(raw[:1024*50])
     except:

src/calibre/ebooks/conversion/plugins/pdf_input.py

@@ -7,8 +7,6 @@
 import os
 
 from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
-from calibre.constants import plugins
-pdfreflow, pdfreflow_err = plugins['pdfreflow']
 
 class PDFInput(InputFormatPlugin):
 
@@ -29,6 +27,9 @@ class PDFInput(InputFormatPlugin):
     ])
 
     def convert_new(self, stream, accelerators):
+        from calibre.constants import plugins
+        pdfreflow, pdfreflow_err = plugins['pdfreflow']
+
         from calibre.ebooks.pdf.reflow import PDFDocument
         from calibre.utils.cleantext import clean_ascii_chars
         if pdfreflow_err:

src/calibre/ebooks/epub/fix/epubcheck.py

@@ -6,7 +6,6 @@
 __docformat__ = 'restructuredtext en'
 
 from calibre.ebooks.epub.fix import ePubFixer, InvalidEpub
-from calibre.utils.date import parse_date, strptime
 
 
 class Epubcheck(ePubFixer):
@@ -35,6 +34,8 @@ def fix_name(self):
         return 'epubcheck'
 
     def fix_pubdates(self):
+        from calibre.utils.date import parse_date, strptime
+
         dirtied = False
         opf = self.container.opf
         for dcdate in opf.xpath('//dc:date',

src/calibre/ebooks/metadata/book/base.py

@@ -710,7 +710,7 @@ def fmt(x, y):
             fmt('Title sort', self.title_sort)
         if self.authors:
             fmt('Author(s)',  authors_to_string(self.authors) + \
-               ((' [' + self.author_sort + ']') 
+               ((' [' + self.author_sort + ']')
                 if self.author_sort and self.author_sort != _('Unknown') else ''))
         if self.publisher:
             fmt('Publisher', self.publisher)

src/calibre/ebooks/metadata/book/json_codec.py

@@ -12,7 +12,6 @@
 from calibre.constants import filesystem_encoding, preferred_encoding
 from calibre.library.field_metadata import FieldMetadata
 from calibre.utils.date import parse_date, isoformat, UNDEFINED_DATE, local_tz
-from calibre.utils.magick import Image
 from calibre import isbytestring
 
 # Translate datetimes to and from strings. The string form is the datetime in
@@ -37,6 +36,8 @@ def encode_thumbnail(thumbnail):
     '''
     Encode the image part of a thumbnail, then return the 3 part tuple
     '''
+    from calibre.utils.magick import Image
+
     if thumbnail is None:
         return None
     if not isinstance(thumbnail, (tuple, list)):

src/calibre/ebooks/metadata/sources/amazon.py

@@ -12,19 +12,14 @@
 from threading import Thread
 from Queue import Queue, Empty
 
-from lxml.html import tostring
 
 from calibre import as_unicode
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import (Source, Option, fixcase,
         fixauthors)
-from calibre.utils.cleantext import clean_ascii_chars
-from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.metadata.book.base import Metadata
-from calibre.library.comments import sanitize_comments_html
 from calibre.utils.date import parse_date
 from calibre.utils.localization import canonicalize_lang
-from calibre.utils.soupparser import fromstring
 
 class Worker(Thread): # Get details {{{
 
@@ -43,6 +38,8 @@ def __init__(self, url, result_queue, browser, log, relevance, domain,
         self.browser = browser.clone_browser()
         self.cover_url = self.amazon_id = self.isbn = None
         self.domain = domain
+        from lxml.html import tostring
+        self.tostring = tostring
 
         months = {
                 'de': {
@@ -176,6 +173,10 @@ def run(self):
             self.log.exception('get_details failed for url: %r'%self.url)
 
     def get_details(self):
+        from calibre.utils.cleantext import clean_ascii_chars
+        from calibre.utils.soupparser import fromstring
+        from calibre.ebooks.chardet import xml_to_unicode
+
         try:
             raw = self.browser.open_novisit(self.url, timeout=self.timeout).read().strip()
         except Exception as e:
@@ -210,7 +211,7 @@ def get_details(self):
         errmsg = root.xpath('//*[@id="errorMessage"]')
         if errmsg:
             msg = 'Failed to parse amazon details page: %r'%self.url
-            msg += tostring(errmsg, method='text', encoding=unicode).strip()
+            msg += self.tostring(errmsg, method='text', encoding=unicode).strip()
             self.log.error(msg)
             return
 
@@ -322,10 +323,10 @@ def parse_title(self, root):
         tdiv = root.xpath('//h1[contains(@class, "parseasinTitle")]')[0]
         actual_title = tdiv.xpath('descendant::*[@id="btAsinTitle"]')
         if actual_title:
-            title = tostring(actual_title[0], encoding=unicode,
+            title = self.tostring(actual_title[0], encoding=unicode,
                     method='text').strip()
         else:
-            title = tostring(tdiv, encoding=unicode, method='text').strip()
+            title = self.tostring(tdiv, encoding=unicode, method='text').strip()
         return re.sub(r'[(\[].*[)\]]', '', title).strip()
 
     def parse_authors(self, root):
@@ -337,7 +338,7 @@ def parse_authors(self, root):
                     ''')
         for x in aname:
             x.tail = ''
-        authors = [tostring(x, encoding=unicode, method='text').strip() for x
+        authors = [self.tostring(x, encoding=unicode, method='text').strip() for x
                 in aname]
         authors = [a for a in authors if a]
         return authors
@@ -356,6 +357,8 @@ def parse_rating(self, root):
                     return float(m.group(1))/float(m.group(3)) * 5
 
     def parse_comments(self, root):
+        from calibre.library.comments import sanitize_comments_html
+
         desc = root.xpath('//div[@id="productDescription"]/*[@class="content"]')
         if desc:
             desc = desc[0]
@@ -365,7 +368,7 @@ def parse_comments(self, root):
             for a in desc.xpath('descendant::a[@href]'):
                 del a.attrib['href']
                 a.tag = 'span'
-            desc = tostring(desc, method='html', encoding=unicode).strip()
+            desc = self.tostring(desc, method='html', encoding=unicode).strip()
 
             # Encoding bug in Amazon data U+fffd (replacement char)
             # in some examples it is present in place of '
@@ -602,6 +605,11 @@ def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
         Note this method will retry without identifiers automatically if no
         match is found with identifiers.
         '''
+        from lxml.html import tostring
+        from calibre.utils.cleantext import clean_ascii_chars
+        from calibre.utils.soupparser import fromstring
+        from calibre.ebooks.chardet import xml_to_unicode
+
         query, domain = self.create_query(log, title=title, authors=authors,
                 identifiers=identifiers)
         if query is None:

src/calibre/ebooks/metadata/sources/base.py

@@ -12,7 +12,6 @@
 
 from calibre import browser, random_user_agent
 from calibre.customize import Plugin
-from calibre.utils.logging import ThreadSafeLog, FileStream
 from calibre.utils.config import JSONConfig
 from calibre.utils.titlecase import titlecase
 from calibre.utils.icu import capitalize, lower, upper
@@ -34,6 +33,7 @@
 msprefs.defaults['cover_priorities'] = {'Google':2}
 
 def create_log(ostream=None):
+    from calibre.utils.logging import ThreadSafeLog, FileStream
     log = ThreadSafeLog(level=ThreadSafeLog.DEBUG)
     log.outputs = [FileStream(ostream)]
     return log

src/calibre/ebooks/metadata/sources/douban.py

@@ -12,14 +12,10 @@
 from functools import partial
 from Queue import Queue, Empty
 
-from lxml import etree
 
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import Source
 from calibre.ebooks.metadata.book.base import Metadata
-from calibre.ebooks.chardet import xml_to_unicode
-from calibre.utils.date import parse_date, utcnow
-from calibre.utils.cleantext import clean_ascii_chars
 from calibre import as_unicode
 
 NAMESPACES = {
@@ -28,22 +24,6 @@
               'db': 'http://www.douban.com/xmlns/',
               'gd': 'http://schemas.google.com/g/2005'
             }
-XPath = partial(etree.XPath, namespaces=NAMESPACES)
-total_results  = XPath('//openSearch:totalResults')
-start_index    = XPath('//openSearch:startIndex')
-items_per_page = XPath('//openSearch:itemsPerPage')
-entry          = XPath('//atom:entry')
-entry_id       = XPath('descendant::atom:id')
-title          = XPath('descendant::atom:title')
-description    = XPath('descendant::atom:summary')
-publisher      = XPath("descendant::db:attribute[@name='publisher']")
-isbn           = XPath("descendant::db:attribute[@name='isbn13']")
-date           = XPath("descendant::db:attribute[@name='pubdate']")
-creator        = XPath("descendant::db:attribute[@name='author']")
-booktag        = XPath("descendant::db:tag/attribute::name")
-rating         = XPath("descendant::gd:rating/attribute::average")
-cover_url      = XPath("descendant::atom:link[@rel='image']/attribute::href")
-
 def get_details(browser, url, timeout): # {{{
     try:
         if Douban.DOUBAN_API_KEY and Douban.DOUBAN_API_KEY != '':
@@ -61,6 +41,25 @@ def get_details(browser, url, timeout): # {{{
 # }}}
 
 def to_metadata(browser, log, entry_, timeout): # {{{
+    from lxml import etree
+    from calibre.ebooks.chardet import xml_to_unicode
+    from calibre.utils.date import parse_date, utcnow
+    from calibre.utils.cleantext import clean_ascii_chars
+
+    XPath = partial(etree.XPath, namespaces=NAMESPACES)
+    entry          = XPath('//atom:entry')
+    entry_id       = XPath('descendant::atom:id')
+    title          = XPath('descendant::atom:title')
+    description    = XPath('descendant::atom:summary')
+    publisher      = XPath("descendant::db:attribute[@name='publisher']")
+    isbn           = XPath("descendant::db:attribute[@name='isbn13']")
+    date           = XPath("descendant::db:attribute[@name='pubdate']")
+    creator        = XPath("descendant::db:attribute[@name='author']")
+    booktag        = XPath("descendant::db:tag/attribute::name")
+    rating         = XPath("descendant::gd:rating/attribute::average")
+    cover_url      = XPath("descendant::atom:link[@rel='image']/attribute::href")
+
+
     def get_text(extra, x):
         try:
             ans = x(extra)
@@ -275,6 +274,7 @@ def get_cached_cover_url(self, identifiers): # {{{
 
     def get_all_details(self, br, log, entries, abort, # {{{
             result_queue, timeout):
+        from lxml import etree
         for relevance, i in enumerate(entries):
             try:
                 ans = to_metadata(br, log, i, timeout)
@@ -298,6 +298,13 @@ def get_all_details(self, br, log, entries, abort, # {{{
 
     def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
             identifiers={}, timeout=30):
+        from lxml import etree
+        from calibre.ebooks.chardet import xml_to_unicode
+        from calibre.utils.cleantext import clean_ascii_chars
+
+        XPath = partial(etree.XPath, namespaces=NAMESPACES)
+        entry          = XPath('//atom:entry')
+
         query = self.create_query(log, title=title, authors=authors,
                 identifiers=identifiers)
         if not query:

src/calibre/ebooks/metadata/sources/google.py

@@ -12,8 +12,6 @@
 from functools import partial
 from Queue import Queue, Empty
 
-from lxml import etree
-
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import Source
 from calibre.ebooks.metadata.book.base import Metadata
@@ -29,23 +27,6 @@
               'dc'   : 'http://purl.org/dc/terms',
               'gd'   : 'http://schemas.google.com/g/2005'
             }
-XPath = partial(etree.XPath, namespaces=NAMESPACES)
-
-total_results  = XPath('//openSearch:totalResults')
-start_index    = XPath('//openSearch:startIndex')
-items_per_page = XPath('//openSearch:itemsPerPage')
-entry          = XPath('//atom:entry')
-entry_id       = XPath('descendant::atom:id')
-creator        = XPath('descendant::dc:creator')
-identifier     = XPath('descendant::dc:identifier')
-title          = XPath('descendant::dc:title')
-date           = XPath('descendant::dc:date')
-publisher      = XPath('descendant::dc:publisher')
-subject        = XPath('descendant::dc:subject')
-description    = XPath('descendant::dc:description')
-language       = XPath('descendant::dc:language')
-rating         = XPath('descendant::gd:rating[@average]')
-
 def get_details(browser, url, timeout): # {{{
     try:
         raw = browser.open_novisit(url, timeout=timeout).read()
@@ -61,6 +42,24 @@ def get_details(browser, url, timeout): # {{{
 # }}}
 
 def to_metadata(browser, log, entry_, timeout): # {{{
+    from lxml import etree
+    XPath = partial(etree.XPath, namespaces=NAMESPACES)
+
+    # total_results  = XPath('//openSearch:totalResults')
+    # start_index    = XPath('//openSearch:startIndex')
+    # items_per_page = XPath('//openSearch:itemsPerPage')
+    entry          = XPath('//atom:entry')
+    entry_id       = XPath('descendant::atom:id')
+    creator        = XPath('descendant::dc:creator')
+    identifier     = XPath('descendant::dc:identifier')
+    title          = XPath('descendant::dc:title')
+    date           = XPath('descendant::dc:date')
+    publisher      = XPath('descendant::dc:publisher')
+    subject        = XPath('descendant::dc:subject')
+    description    = XPath('descendant::dc:description')
+    language       = XPath('descendant::dc:language')
+    rating         = XPath('descendant::gd:rating[@average]')
+
 
     def get_text(extra, x):
         try:
@@ -266,6 +265,7 @@ def get_cached_cover_url(self, identifiers): # {{{
 
     def get_all_details(self, br, log, entries, abort, # {{{
             result_queue, timeout):
+        from lxml import etree
         for relevance, i in enumerate(entries):
             try:
                 ans = to_metadata(br, log, i, timeout)
@@ -289,6 +289,10 @@ def get_all_details(self, br, log, entries, abort, # {{{
 
     def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
             identifiers={}, timeout=30):
+        from lxml import etree
+        XPath = partial(etree.XPath, namespaces=NAMESPACES)
+        entry          = XPath('//atom:entry')
+
         query = self.create_query(log, title=title, authors=authors,
                 identifiers=identifiers)
         if not query:

src/calibre/ebooks/metadata/sources/isbndb.py

@@ -9,12 +9,9 @@
 
 from urllib import quote
 
-from lxml import etree
 
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import Source, Option
-from calibre.ebooks.chardet import xml_to_unicode
-from calibre.utils.cleantext import clean_ascii_chars
 from calibre.utils.icu import lower
 from calibre.ebooks.metadata.book.base import Metadata
 
@@ -122,6 +119,7 @@ def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
             result_queue.put(result)
 
     def parse_feed(self, feed, seen, orig_title, orig_authors, identifiers):
+        from lxml import etree
 
         def tostring(x):
             if x is None:
@@ -198,6 +196,10 @@ def ismatch(title, authors):
 
     def make_query(self, q, abort, title=None, authors=None, identifiers={},
             max_pages=10, timeout=30):
+        from lxml import etree
+        from calibre.ebooks.chardet import xml_to_unicode
+        from calibre.utils.cleantext import clean_ascii_chars
+
         page_num = 1
         parser = etree.XMLParser(recover=True, no_network=True)
         br = self.browser

src/calibre/ebooks/metadata/sources/overdrive.py

@@ -9,18 +9,14 @@
 '''
 Fetch metadata using Overdrive Content Reserve
 '''
-import re, random, mechanize, copy, json
+import re, random, copy, json
 from threading import RLock
 from Queue import Queue, Empty
 
-from lxml import html
 
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import Source, Option
 from calibre.ebooks.metadata.book.base import Metadata
-from calibre.ebooks.chardet import xml_to_unicode
-from calibre.library.comments import sanitize_comments_html
-from calibre.utils.soupparser import fromstring
 
 ovrdrv_data_cache = {}
 cache_lock = RLock()
@@ -80,6 +76,7 @@ def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
 
     def download_cover(self, log, result_queue, abort, # {{{
             title=None, authors=None, identifiers={}, timeout=30):
+        import mechanize
         cached_url = self.get_cached_cover_url(identifiers)
         if cached_url is None:
             log.info('No cached cover found, running identify')
@@ -170,6 +167,7 @@ def safe_query(self, br, query_url, post=''):
         this page attempts to set a cookie that Mechanize doesn't like
         copy the cookiejar to a separate instance and make a one-off request with the temp cookiejar
         '''
+        import mechanize
         goodcookies = br._ua_handlers['_cookies'].cookiejar
         clean_cj = mechanize.CookieJar()
         cookies_to_copy = []
@@ -187,6 +185,7 @@ def safe_query(self, br, query_url, post=''):
         br.set_cookiejar(clean_cj)
 
     def overdrive_search(self, br, log, q, title, author):
+        import mechanize
         # re-initialize the cookiejar to so that it's clean
         clean_cj = mechanize.CookieJar()
         br.set_cookiejar(clean_cj)
@@ -303,6 +302,7 @@ def sort_ovrdrv_results(self, raw, log, title=None, title_tokens=None, author=No
             return ''
 
     def overdrive_get_record(self, br, log, q, ovrdrv_id):
+        import mechanize
         search_url = q+'SearchResults.aspx?ReserveID={'+ovrdrv_id+'}'
         results_url = q+'SearchResults.svc/GetResults?sEcho=1&iColumns=18&sColumns=ReserveID%2CTitle%2CSubtitle%2CEdition%2CSeries%2CPublisher%2CFormat%2CFormatID%2CCreators%2CThumbImage%2CShortDescription%2CWorldCatLink%2CExcerptLink%2CCreatorFile%2CSortTitle%2CAvailableToLibrary%2CAvailableToRetailer%2CRelevancyRank&iDisplayStart=0&iDisplayLength=10&sSearch=&bEscapeRegex=true&iSortingCols=1&iSortCol_0=17&sSortDir_0=asc'
 
@@ -393,6 +393,11 @@ def parse_search_results(self, ovrdrv_data, mi):
 
 
     def get_book_detail(self, br, metadata_url, mi, ovrdrv_id, log):
+        from lxml import html
+        from calibre.ebooks.chardet import xml_to_unicode
+        from calibre.utils.soupparser import fromstring
+        from calibre.library.comments import sanitize_comments_html
+
         try:
             raw = br.open_novisit(metadata_url).read()
         except Exception, e:

src/calibre/ebooks/metadata/sources/ozon.py

@@ -6,15 +6,11 @@
 __docformat__ = 'restructuredtext en'
 
 import re
-import urllib2
 import datetime
 from urllib import quote_plus
 from Queue import Queue, Empty
-from lxml import etree, html
+
 from calibre import as_unicode
-
-from calibre.ebooks.chardet import xml_to_unicode
-
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import Source
 from calibre.ebooks.metadata.book.base import Metadata
@@ -43,6 +39,7 @@ class Ozon(Source):
     isbnRegex = re.compile(isbnPattern)
 
     def get_book_url(self, identifiers): # {{{
+        import urllib2
         ozon_id = identifiers.get('ozon', None)
         res = None
         if ozon_id:
@@ -81,6 +78,9 @@ def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
 
     def identify(self, log, result_queue, abort, title=None, authors=None,
             identifiers={}, timeout=30): # {{{
+        from lxml import etree
+        from calibre.ebooks.chardet import xml_to_unicode
+
         if not self.is_configured():
             return
         query = self.create_query(log, title=title, authors=authors, identifiers=identifiers)
@@ -283,6 +283,9 @@ def download_cover(self, log, result_queue, abort, title=None, authors=None, ide
     # }}}
 
     def get_book_details(self, log, metadata, timeout): # {{{
+        from lxml import html, etree
+        from calibre.ebooks.chardet import xml_to_unicode
+
         url = self.get_book_url(metadata.get_identifiers())[2]
 
         raw = self.browser.open_novisit(url, timeout=timeout).read()

src/calibre/library/catalogs/bibtex.py

@@ -12,7 +12,6 @@
 from calibre import (strftime)
 from calibre.customize import CatalogPlugin
 from calibre.library.catalogs import FIELDS, TEMPLATE_ALLOWED_FIELDS
-from calibre.utils.logging import default_log as log
 from calibre.customize.conversion import DummyReporter
 from calibre.constants import preferred_encoding
 
@@ -113,6 +112,7 @@ def run(self, path_to_output, opts, db, notification=DummyReporter()):
         from calibre.utils.bibtex import BibTeX
         from calibre.library.save_to_disk import preprocess_template
         from calibre.utils.date import now as nowf
+        from calibre.utils.logging import default_log as log
 
         def create_bibtex_entry(entry, fields, mode, template_citation,
                                     bibtexdict, db, citation_bibtex=True, calibre_files=True):

src/calibre/library/catalogs/csv_xml.py

@@ -10,7 +10,6 @@
 
 from calibre.customize import CatalogPlugin
 from calibre.library.catalogs import FIELDS
-from calibre.utils.logging import default_log as log
 from calibre.customize.conversion import DummyReporter
 
 class CSV_XML(CatalogPlugin):
@@ -52,6 +51,7 @@ def run(self, path_to_output, opts, db, notification=DummyReporter()):
         from calibre.utils.date import isoformat
         from calibre.utils.html2text import html2text
         from lxml import etree
+        from calibre.utils.logging import default_log as log
 
         self.fmt = path_to_output.rpartition('.')[2]
         self.notification = notification

src/calibre/library/catalogs/epub_mobi.py

@@ -14,7 +14,6 @@
 from calibre.constants import DEBUG
 from calibre.customize import CatalogPlugin
 from calibre.customize.conversion import OptionRecommendation, DummyReporter
-from calibre.utils.logging import default_log as log
 
 Option = namedtuple('Option', 'option, default, dest, action, help')
 
@@ -161,6 +160,8 @@ class EPUB_MOBI(CatalogPlugin):
 
     def run(self, path_to_output, opts, db, notification=DummyReporter()):
         from calibre.library.catalogs.epub_mobi_builder import CatalogBuilder
+        from calibre.utils.logging import default_log as log
+
         opts.log = log
         opts.fmt = self.fmt = path_to_output.rpartition('.')[2]
 

src/calibre/utils/date.py

@@ -10,7 +10,6 @@
 from datetime import datetime, time
 from functools import partial
 
-from dateutil.parser import parse
 from dateutil.tz import tzlocal, tzutc
 
 from calibre import strftime
@@ -71,6 +70,7 @@ def parse_date(date_string, assume_utc=False, as_utc=True, default=None):
     :param default: Missing fields are filled in from default. If None, the
     current date is used.
     '''
+    from dateutil.parser import parse
     if not date_string:
         return UNDEFINED_DATE
     if default is None: