More rename, more -python2

jellypy/newsletters.py

@@ -15,40 +15,25 @@
 #  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
-
-import arrow
-from collections import OrderedDict
 import json
-from itertools import groupby
-from mako.lookup import TemplateLookup
-from mako import exceptions
 import os
 import re
+from collections import OrderedDict
+from itertools import groupby
+
+import arrow
+from mako import exceptions
+from mako.lookup import TemplateLookup
 
 import jellypy
-if jellypy.PYTHON2:
-    import common
-    import database
-    import helpers
-    import libraries
-    import logger
-    import newsletter_handler
-    import pmsconnect
-    from notifiers import send_notification, EMAIL
-else:
-    from jellypy import common
-    from jellypy import database
-    from jellypy import helpers
-    from jellypy import libraries
-    from jellypy import logger
-    from jellypy import newsletter_handler
-    from jellypy import pmsconnect
-    from jellypy.notifiers import send_notification, EMAIL
-
+from jellypy import common
+from jellypy import database
+from jellypy import helpers
+from jellypy import libraries
+from jellypy import logger
+from jellypy import newsletter_handler
+from jellypy import pmsconnect
+from jellypy.notifiers import send_notification, EMAIL
 
 AGENT_IDS = {
     'recently_added': 0
@@ -512,7 +497,8 @@ class Newsletter(object):
         self.newsletter = self.generate_newsletter()
 
         if self.template_error:
-            logger.error("Tautulli Newsletters :: %s newsletter failed to render template. Newsletter not sent." % self.NAME)
+            logger.error(
+                "Tautulli Newsletters :: %s newsletter failed to render template. Newsletter not sent." % self.NAME)
             return False
 
         if not self._has_data():
@@ -540,7 +526,7 @@ class Newsletter(object):
                 for line in self.newsletter.splitlines():
                     if '<!-- IGNORE SAVE -->' not in line:
                         n_file.write((line + '\r\n').encode('utf-8'))
-                        #n_file.write(line.strip())
+                        # n_file.write(line.strip())
 
             logger.info("Tautulli Newsletters :: %s newsletter saved to '%s'" % (self.NAME, newsletter_file))
         except OSError as e:
@@ -578,10 +564,10 @@ class Newsletter(object):
                 )
         elif self.config['notifier_id']:
             return send_notification(
-                    notifier_id=self.config['notifier_id'],
-                    subject=self.subject_formatted,
-                    body=self.body_formatted
-                )
+                notifier_id=self.config['notifier_id'],
+                subject=self.subject_formatted,
+                body=self.body_formatted
+            )
 
     def build_params(self):
         parameters = self._build_params()
@@ -628,7 +614,8 @@ class Newsletter(object):
         try:
             subject = custom_formatter.format(str(self.subject), **self.parameters)
         except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter subject. Using fallback." % e)
+            logger.error(
+                "Tautulli Newsletter :: Unable to parse parameter %s in newsletter subject. Using fallback." % e)
             subject = str(self._DEFAULT_SUBJECT).format(**self.parameters)
         except Exception as e:
             logger.error("Tautulli Newsletter :: Unable to parse custom newsletter subject: %s. Using fallback." % e)
@@ -646,7 +633,8 @@ class Newsletter(object):
         try:
             message = custom_formatter.format(str(self.message), **self.parameters)
         except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter message. Using fallback." % e)
+            logger.error(
+                "Tautulli Newsletter :: Unable to parse parameter %s in newsletter message. Using fallback." % e)
             message = str(self._DEFAULT_MESSAGE).format(**self.parameters)
         except Exception as e:
             logger.error("Tautulli Newsletter :: Unable to parse custom newsletter message: %s. Using fallback." % e)
@@ -661,7 +649,8 @@ class Newsletter(object):
         try:
             filename = custom_formatter.format(str(self.filename), **self.parameters)
         except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter filename. Using fallback." % e)
+            logger.error(
+                "Tautulli Newsletter :: Unable to parse parameter %s in newsletter filename. Using fallback." % e)
             filename = str(self._DEFAULT_FILENAME).format(**self.parameters)
         except Exception as e:
             logger.error("Tautulli Newsletter :: Unable to parse custom newsletter subject: %s. Using fallback." % e)
@@ -821,7 +810,8 @@ class RecentlyAdded(Newsletter):
         from jellypy.notification_handler import get_img_info, set_hash_image_info
 
         if not self.config['incl_libraries']:
-            logger.warn("Tautulli Newsletters :: Failed to retrieve %s newsletter data: no libraries selected." % self.NAME)
+            logger.warn(
+                "Tautulli Newsletters :: Failed to retrieve %s newsletter data: no libraries selected." % self.NAME)
 
         media_types = set()
         for s in self._get_sections():