More rename, more -python2

jellypy/datatables.py

@@ -13,20 +13,11 @@
 #  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
-
 import re
 
-import jellypy
-if jellypy.PYTHON2:
-    import database
-    import helpers
-    import logger
-else:
-    from jellypy import database
-    from jellypy import helpers
-    from jellypy import logger
+from jellypy import database
+from jellypy import helpers
+from jellypy import logger
 
 
 class DataTables(object):
@@ -224,7 +215,7 @@ class DataTables(object):
                         args.append('%' + search_param + '%')
             if where:
                 where = 'WHERE ' + where.rstrip(' OR ')
-        
+
         return where, args
 
     # This method extracts column data from our column list