Merge branch 'dev'

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.

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()

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.3.12"
+PLEXPY_RELEASE_VERSION = "1.3.13"