anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
JonnyWong16
2016-03-27 17:25:53 -07:00
parent 92f55c254c bff22900cb
commit c8ee25dc6d
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -1,5 +1,10 @@
# Changelog # Changelog
## v1.3.13 (2016-03-27)
* Fix: Only mask strings longer than 5 characters in logs.
## v1.3.12 (2016-03-27) ## v1.3.12 (2016-03-27)
* Fix: "Check GitHub for updates" not rescheduling when toggling setting. * Fix: "Check GitHub for updates" not rescheduling when toggling setting.

7
plexpy/config.py
View File

@@ -458,10 +458,11 @@ class Config(object):
for key, subkeys in self._config.iteritems(): for key, subkeys in self._config.iteritems():
for subkey, value in subkeys.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): if isinstance(value, basestring) and len(value.strip()) > 5 and \
blacklist.append(str(value).strip()) 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): def _define(self, name):
key = name.upper() key = name.upper()

2
plexpy/version.py
View File

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