More rename, more -python2

jellypy/newsletter_handler.py

@@ -15,26 +15,17 @@
 #  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 io import open
+import email.utils
 import os
+from io import open
 
 from apscheduler.triggers.cron import CronTrigger
-import email.utils
 
 import jellypy
-if jellypy.PYTHON2:
-    import database
-    import helpers
-    import logger
-    import newsletters
-else:
-    from jellypy import database
-    from jellypy import helpers
-    from jellypy import logger
-    from jellypy import newsletters
-
+from jellypy import database
+from jellypy import helpers
+from jellypy import logger
+from jellypy import newsletters
 
 NEWSLETTER_SCHED = None
 
@@ -59,7 +50,8 @@ def schedule_newsletters(newsletter_id=None):
 
         if newsletter['active']:
             schedule_newsletter_job('newsletter-{}'.format(newsletter['id']), name=newsletter_job_name,
-                                    func=add_newsletter_each, args=[newsletter['id'], 'on_cron'], cron=newsletter['cron'])
+                                    func=add_newsletter_each, args=[newsletter['id'], 'on_cron'],
+                                    cron=newsletter['cron'])
         else:
             schedule_newsletter_job('newsletter-{}'.format(newsletter['id']), name=newsletter_job_name,
                                     remove_job=True)
@@ -143,7 +135,6 @@ def notify(newsletter_id=None, notify_action=None, **kwargs):
 
 def set_notify_state(newsletter, notify_action, subject, body, message, filename,
                      start_date, end_date, start_time, end_time, newsletter_uuid, email_msg_id):
-
     if newsletter and notify_action:
         db = database.MonitorDatabase()
 
@@ -220,6 +211,7 @@ def get_newsletter(newsletter_uuid=None, newsletter_id_name=None):
                     newsletter = n_file.read()
                 return newsletter
             except OSError as e:
-                logger.error("Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
+                logger.error(
+                    "Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
         else:
             logger.warn("Tautulli NewsletterHandler :: Newsletter file '%s' is missing." % newsletter_file)