More rename, more -python2

jellypy/mobile_app.py

@@ -15,22 +15,13 @@
 #  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 str
-
-import requests
 import threading
 
-import jellypy
-if jellypy.PYTHON2:
-    import database
-    import helpers
-    import logger
-else:
-    from jellypy import database
-    from jellypy import helpers
-    from jellypy import logger
+import requests
 
+from jellypy import database
+from jellypy import helpers
+from jellypy import logger
 
 TEMP_DEVICE_TOKEN = None
 INVALIDATE_TIMER = None
@@ -118,7 +109,8 @@ def get_mobile_device_config(mobile_device_id=None):
     if str(mobile_device_id).isdigit():
         mobile_device_id = int(mobile_device_id)
     else:
-        logger.error("Tautulli MobileApp :: Unable to retrieve mobile device config: invalid mobile_device_id %s." % mobile_device_id)
+        logger.error(
+            "Tautulli MobileApp :: Unable to retrieve mobile device config: invalid mobile_device_id %s." % mobile_device_id)
         return None
 
     db = database.MonitorDatabase()
@@ -132,7 +124,8 @@ def set_mobile_device_config(mobile_device_id=None, **kwargs):
     if str(mobile_device_id).isdigit():
         mobile_device_id = int(mobile_device_id)
     else:
-        logger.error("Tautulli MobileApp :: Unable to set exisiting mobile device: invalid mobile_device_id %s." % mobile_device_id)
+        logger.error(
+            "Tautulli MobileApp :: Unable to set exisiting mobile device: invalid mobile_device_id %s." % mobile_device_id)
         return False
 
     keys = {'id': mobile_device_id}