More rename, more -python2

jellypy/users.py

@@ -14,34 +14,19 @@
 #
 #  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 next
-from future.builtins import str
-from future.builtins import object
-from future.moves.urllib.parse import parse_qsl
+from urllib.parse import parse_qsl
 
 import httpagentparser
 
 import jellypy
-if jellypy.PYTHON2:
-    import common
-    import database
-    import datatables
-    import helpers
-    import libraries
-    import logger
-    import plextv
-    import session
-else:
-    from jellypy import common
-    from jellypy import database
-    from jellypy import datatables
-    from jellypy import helpers
-    from jellypy import libraries
-    from jellypy import logger
-    from jellypy import plextv
-    from jellypy import session
+from jellypy import common
+from jellypy import database
+from jellypy import datatables
+from jellypy import helpers
+from jellypy import libraries
+from jellypy import logger
+from jellypy import plextv
+from jellypy import session
 
 
 def refresh_users():
@@ -847,7 +832,8 @@ class Users(object):
 
         return filters_list
 
-    def set_user_login(self, user_id=None, user=None, user_group=None, ip_address=None, host=None, user_agent=None, success=0):
+    def set_user_login(self, user_id=None, user=None, user_group=None, ip_address=None, host=None, user_agent=None,
+                       success=0):
 
         if user_id is None or str(user_id).isdigit():
             monitor_db = database.MonitorDatabase()
@@ -947,4 +933,4 @@ class Users(object):
             return True
         except Exception as e:
             logger.warn("Tautulli Users :: Unable to execute database query for delete_login_log: %s." % e)
-            return False
+            return False