More rename, more -python2

jellypy/plexivity_import.py

@@ -15,26 +15,16 @@
 #  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 arrow
 import sqlite3
 from xml.dom import minidom
 
-import jellypy
-if jellypy.PYTHON2:
-    import activity_processor
-    import database
-    import helpers
-    import logger
-    import users
-else:
-    from jellypy import activity_processor
-    from jellypy import database
-    from jellypy import helpers
-    from jellypy import logger
-    from jellypy import users
+import arrow
+
+from jellypy import activity_processor
+from jellypy import database
+from jellypy import helpers
+from jellypy import logger
+from jellypy import users
 
 
 def extract_plexivity_xml(xml=None):
@@ -274,7 +264,6 @@ def validate_database(database_file=None, table_name=None):
 
 
 def import_from_plexivity(database_file=None, table_name=None, import_ignore_interval=0):
-
     try:
         connection = sqlite3.connect(database_file, timeout=20)
         connection.row_factory = sqlite3.Row
@@ -339,7 +328,7 @@ def import_from_plexivity(database_file=None, table_name=None, import_ignore_int
             continue
 
         # Skip line if we don't have a ratingKey to work with
-        #if not row['rating_key']:
+        # if not row['rating_key']:
         #    logger.error("Tautulli Importer :: Skipping record due to null ratingKey.")
         #    continue