More rename, more -python2

jellypy/webauth.py

@@ -20,28 +20,20 @@
 # Form based authentication for CherryPy. Requires the
 # Session tool to be loaded.
 
-from future.builtins import object
 
 from datetime import datetime, timedelta
-from future.moves.urllib.parse import quote, unquote
+from urllib.parse import quote, unquote
 
 import cherrypy
-from hashing_passwords import check_hash
 import jwt
+from hashing_passwords import check_hash
 
 import jellypy
-if jellypy.PYTHON2:
-    import logger
-    from database import MonitorDatabase
-    from helpers import timestamp
-    from users import Users, refresh_users
-    from plextv import PlexTV
-else:
-    from jellypy import logger
-    from jellypy.database import MonitorDatabase
-    from jellypy.helpers import timestamp
-    from jellypy.users import Users, refresh_users
-    from jellypy.plextv import PlexTV
+from jellypy import logger
+from jellypy.database import MonitorDatabase
+from jellypy.helpers import timestamp
+from jellypy.users import Users, refresh_users
+from jellypy.plextv import PlexTV
 
 # Monkey patch SameSite support into cookies.
 # https://stackoverflow.com/a/50813092
@@ -199,6 +191,7 @@ def check_auth(*args, **kwargs):
 def requireAuth(*conditions):
     """A decorator that appends conditions to the auth.require config
     variable."""
+
     def decorate(f):
         if not hasattr(f, '_cp_config'):
             f._cp_config = dict()
@@ -206,6 +199,7 @@ def requireAuth(*conditions):
             f._cp_config['auth.require'] = []
         f._cp_config['auth.require'].extend(conditions)
         return f
+
     return decorate
 
 
@@ -228,11 +222,13 @@ def name_is(user_name):
 
 def any_of(*conditions):
     """Returns True if any of the conditions match"""
+
     def check():
         for c in conditions:
             if c():
                 return True
         return False
+
     return check
 
 
@@ -240,11 +236,13 @@ def any_of(*conditions):
 # needed if you want to use it inside of an any_of(...) condition
 def all_of(*conditions):
     """Returns True if all of the conditions match"""
+
     def check():
         for c in conditions:
             if not c():
                 return False
         return True
+
     return check