From 8eebae3bf5e41b761878f6c618dce34d84f0a2d9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 15 May 2012 15:40:35 +0530 Subject: [PATCH] Fix #999564 (calibre show username/password as clear text in logs) --- src/calibre/ebooks/conversion/plumber.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 6c889cb259..78821fa595 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -889,7 +889,10 @@ OptionRecommendation(name='search_replace', self.log.debug('Resolved conversion options') try: self.log.debug('calibre version:', __version__) - self.log.debug(pprint.pformat(self.opts.__dict__)) + odict = dict(self.opts.__dict__) + for x in ('username', 'password'): + odict.pop(x, None) + self.log.debug(pprint.pformat(odict)) except: self.log.exception('Failed to get resolved conversion options')