More rename, more -python2

jellypy/config.py

@@ -13,25 +13,17 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
-from future.builtins import object
-from future.builtins import str
-
 import os
 import re
 import shutil
-import time
 import threading
+import time
 
 from configobj import ConfigObj, ParseError
 
 import jellypy
-if jellypy.PYTHON2:
-    import helpers
-    import logger
-else:
-    from jellypy import helpers
-    from jellypy import logger
+from jellypy import helpers
+from jellypy import logger
 
 
 def bool_int(value):
@@ -114,7 +106,8 @@ _CONFIG_DEFINITIONS = {
     'HOME_SECTIONS': (list, 'General', ['current_activity', 'watch_stats', 'library_stats', 'recently_added']),
     'HOME_LIBRARY_CARDS': (list, 'General', ['first_run']),
     'HOME_STATS_CARDS': (list, 'General', ['top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music',
-        'popular_music', 'last_watched', 'top_users', 'top_platforms', 'most_concurrent']),
+                                           'popular_music', 'last_watched', 'top_users', 'top_platforms',
+                                           'most_concurrent']),
     'HOME_REFRESH_INTERVAL': (int, 'General', 10),
     'HTTPS_CREATE_CERT': (int, 'General', 1),
     'HTTPS_CERT': (str, 'General', ''),
@@ -337,7 +330,7 @@ class Config(object):
         for key, subkeys in self._config.items():
             for subkey, value in subkeys.items():
                 if isinstance(value, str) and len(value.strip()) > 5 and \
-                    subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS):
+                        subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS):
                     blacklist.add(value.strip())
 
         logger._BLACKLIST_WORDS.update(blacklist)