From e776b5b1f6ddd107dd94272c3067dcc426407313 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 19 Apr 2011 14:18:28 -0600 Subject: [PATCH] ... --- src/calibre/__init__.py | 5 +++-- src/calibre/ebooks/conversion/plumber.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py index 7c9638ade1..0bf48a8a97 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -4,8 +4,7 @@ __copyright__ = '2008, Kovid Goyal ' __docformat__ = 'restructuredtext en' import uuid, sys, os, re, logging, time, random, \ - __builtin__, warnings, multiprocessing -from contextlib import closing + __builtin__, warnings from urllib import getproxies from urllib2 import unquote as urllib2_unquote __builtin__.__dict__['dynamic_property'] = lambda(func): func(None) @@ -383,6 +382,7 @@ class StreamReadWrapper(object): def detect_ncpus(): """Detects the number of effective CPUs in the system""" + import multiprocessing ans = -1 try: ans = multiprocessing.cpu_count() @@ -547,6 +547,7 @@ def get_download_filename(url, cookie_file=None): ''' Get a local filename for a URL using the content disposition header ''' + from contextlib import closing filename = '' br = browser() diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index b26befe075..8706d6eb2b 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -875,6 +875,8 @@ OptionRecommendation(name='sr3_replace', if self.opts.verbose: self.log.filter_level = self.log.DEBUG self.flush() + import cssutils, logging + cssutils.log.setLevel(logging.WARN) if self.opts.debug_pipeline is not None: self.opts.verbose = max(self.opts.verbose, 4)