From 5e79c9fd6260e0ee04f467592effee39b391a1a2 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 27 Mar 2016 17:22:30 -0700 Subject: [PATCH 1/2] Only filter logger if string is longer than 5 characters --- plexpy/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plexpy/config.py b/plexpy/config.py index 68ed0a58..00149ede 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -458,10 +458,11 @@ class Config(object): for key, subkeys in self._config.iteritems(): for subkey, value in subkeys.iteritems(): - if str(value).strip() and subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS): - blacklist.append(str(value).strip()) + if isinstance(value, basestring) and len(value.strip()) > 5 and \ + subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS): + blacklist.append(value.strip()) - plexpy.logger._BLACKLIST_WORDS = filter(None, blacklist) + plexpy.logger._BLACKLIST_WORDS = blacklist def _define(self, name): key = name.upper() From bff22900cb3f28cf3b2e1e0d536e47d4cee83539 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 27 Mar 2016 17:25:16 -0700 Subject: [PATCH 2/2] v1.3.13 --- CHANGELOG.md | 5 +++++ plexpy/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13932ded..d24ee1f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v1.3.13 (2016-03-27) + +* Fix: Only mask strings longer than 5 characters in logs. + + ## v1.3.12 (2016-03-27) * Fix: "Check GitHub for updates" not rescheduling when toggling setting. diff --git a/plexpy/version.py b/plexpy/version.py index 586b2a29..9b6265e2 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.3.12" +PLEXPY_RELEASE_VERSION = "1.3.13"