From 1d2a00feab6349d46474939a25eaed7284cacb19 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 7 May 2017 13:26:27 -0500 Subject: [PATCH] Remove debug output of dependency versions. --- calibre-plugin/fff_plugin.py | 15 --------------- calibre-plugin/jobs.py | 15 --------------- fanficfare/cli.py | 18 ------------------ webservice/main.py | 17 ----------------- 4 files changed, 65 deletions(-) diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py index e5724e37..1cab2d29 100644 --- a/calibre-plugin/fff_plugin.py +++ b/calibre-plugin/fff_plugin.py @@ -26,21 +26,6 @@ __docformat__ = 'restructuredtext en' import logging logger = logging.getLogger(__name__) -try: - import bs4 - logger.debug( "BS4 version: %s"%bs4.__version__) - import html5lib - logger.debug( "html5lib version: %s"%html5lib.__version__) - import html2text - logger.debug( "html2text version:") - logger.debug( html2text.__version__) - import chardet - logger.debug( "chardet version: %s"%chardet.__version__) - import six - logger.debug( "six version: %s"%six.__version__) -except: - pass - import os, copy, threading, re, platform, sys from StringIO import StringIO from functools import partial diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py index a45c5f5e..36696d82 100644 --- a/calibre-plugin/jobs.py +++ b/calibre-plugin/jobs.py @@ -115,21 +115,6 @@ def do_download_for_worker(book,options,merge,notification=lambda x,y:x): Child job, to download story when run as a worker job ''' - try: - import bs4 - logger.debug( "BS4 version: %s"%bs4.__version__) - import html5lib - logger.debug( "html5lib version: %s"%html5lib.__version__) - import html2text - logger.debug( "html2text version:") - logger.debug( html2text.__version__) - import chardet - logger.debug( "chardet version: %s"%chardet.__version__) - import six - logger.debug( "six version: %s"%six.__version__) - except: - pass - from calibre_plugins.fanficfare_plugin import FanFicFareBase fffbase = FanFicFareBase(options['plugin_path']) with fffbase: diff --git a/fanficfare/cli.py b/fanficfare/cli.py index 2131e892..bdc22e88 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -148,24 +148,6 @@ def main(argv=None, if not options.debug: logger.setLevel(logging.WARNING) - - try: - import bs4 - logger.debug( "BS4 version: %s"%bs4.__version__) - import html5lib - logger.debug( "html5lib version: %s"%html5lib.__version__) - import html2text - logger.debug( "html2text version:") - logger.debug( html2text.__version__) - import chardet - logger.debug( "chardet version: %s"%chardet.__version__) - import six - logger.debug( "six version: %s"%six.__version__) - import webencodings - logger.debug( "webencodings version: %s"%webencodings.VERSION) - except: - pass - list_only = any((options.imaplist, options.siteslist, options.list, diff --git a/webservice/main.py b/webservice/main.py index 92ca70e1..6c1b0275 100644 --- a/webservice/main.py +++ b/webservice/main.py @@ -317,23 +317,6 @@ class AllRecentFilesServer(webapp2.RequestHandler): fics = q.fetch(200) logging.info("Recent fetched %d downloads for user %s."%(len(fics),user.nickname())) - try: - import bs4 - logging.debug( "BS4 version: %s"%bs4.__version__) - import html5lib - logging.debug( "html5lib version: %s"%html5lib.__version__) - import html2text - logging.debug( "html2text version:") - logging.debug( html2text.__version__) - import chardet - logging.debug( "chardet version: %s"%chardet.__version__) - import six - logging.debug( "six version: %s"%six.__version__) - import webencodings - logging.debug( "webencodings version: %s"%webencodings.VERSION) - except: - pass - sendslugs = [] for fic in fics: