diff --git a/mythplugins/mytharchive/mythburn/scripts/mythburn.py b/mythplugins/mytharchive/mythburn/scripts/mythburn.py
index f2485048a1e..692a4191a65 100755
--- a/mythplugins/mytharchive/mythburn/scripts/mythburn.py
+++ b/mythplugins/mytharchive/mythburn/scripts/mythburn.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 
 # python 3 doesn't have a unicode type
 try:
@@ -115,7 +113,7 @@
 except:
     # Some hardcoded values for ioctl calls,
     # not available on python > 3.5, see include/linux/cdrom.h
-    class CDROM(object):
+    class CDROM:
         CDS_NO_INFO = 0
         CDS_NO_DISC = 1
         CDS_TRAY_OPEN = 2
@@ -257,7 +255,7 @@ def simple_fix_rtl(str):
 #############################################################
 # class to hold a font definition
 
-class FontDef(object):
+class FontDef:
     def __init__(self, name=None, fontFile=None, size=19, color="white", effect="normal", shadowColor="black", shadowSize=1):
         self.name = name
         self.fontFile = fontFile
@@ -308,10 +306,7 @@ def drawText(self, text, color=None):
 def write(text, progress=True):
     """Simple place to channel all text output through"""
 
-    if sys.version_info == 2:
-        sys.stdout.write((text + "\n").encode("utf-8", "replace"))
-    else:
-        sys.stdout.write(text + "\n")
+    sys.stdout.write(text + "\n")
     sys.stdout.flush()
 
     if progress == True and progresslog != "":
@@ -2026,7 +2021,7 @@ def extractVideoFrame(source, destination, seconds):
             return (long(0),long(0))
         else:
             return myimage.size
-    except IOError:
+    except OSError:
         return (long(0),long(0))
 
 #############################################################
@@ -2146,7 +2141,7 @@ def encodeNuvToMPEG2(chanid, starttime, mediafile, destvideofile, folder, profil
     """Encodes a nuv video source file to MPEG2 video and AC3 audio, using mythtranscode & mythffmpeg"""
 
     # make sure mythtranscode hasn't left some stale fifos hanging around
-    if ((doesFileExist(os.path.join(folder, "audout")) or doesFileExist(os.path.join(folder, "vidout")))):
+    if (doesFileExist(os.path.join(folder, "audout")) or doesFileExist(os.path.join(folder, "vidout"))):
         fatalError("Something is wrong! Found one or more stale fifo's from mythtranscode\n"
                    "Delete the fifos in '%s' and start again" % folder)
 
diff --git a/mythplugins/mythgame/mythgame/scripts/giantbomb.py b/mythplugins/mythgame/mythgame/scripts/giantbomb.py
index fd823cc489e..a98640c0380 100755
--- a/mythplugins/mythgame/mythgame/scripts/giantbomb.py
+++ b/mythplugins/mythgame/mythgame/scripts/giantbomb.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: giantbomb.py
 # Python Script
@@ -129,29 +128,21 @@
 import re
 
 
-IS_PY2 = sys.version_info[0] == 2
-
 try:
-    if IS_PY2:
-        from StringIO import StringIO
-    else:
-        from io import StringIO
+    from io import StringIO
     from lxml import etree
 except Exception as e:
-    sys.stderr.write(u'\n! Error - Importing the "lxml" and "StringIO" python libraries failed on error(%s)\n' % e)
+    sys.stderr.write('\n! Error - Importing the "lxml" and "StringIO" python libraries failed on error(%s)\n' % e)
     sys.exit(1)
 
 
-if IS_PY2:
-    stdio_type = file
-else:
-    import io
-    stdio_type = io.TextIOWrapper
-    unicode = str
-    unichr = chr
+import io
+stdio_type = io.TextIOWrapper
+unicode = str
+unichr = chr
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder
     """
     def __init__(self, outstream, encoding=None):
@@ -187,7 +178,7 @@ def __getattr__(self, attr):
     version+=str(digit)+'.'
 version = version[:-1]
 if version < '2.7.2':
-    sys.stderr.write(u'''
+    sys.stderr.write('''
 ! Error - The installed version of the "lxml" python library "libxml" version is too old.
           At least "libxml" version 2.7.2 must be installed. Your version is (%s).
 ''' % version)
@@ -218,22 +209,22 @@ def main():
     # api.giantbomb.com api key provided for Mythtv
     apikey = "b5883a902a8ed88b15ce21d07787c94fd6ad9f33"
 
-    parser = OptionParser(usage=u"%prog usage: giantbomb -hdluvMD [parameters]\n <game name or gameid number>\n\nFor details on using giantbomb from the command execute './giantbomb.py -u'. For details on the meaning of the XML element tags see the wiki page at:\nhttps://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format")
+    parser = OptionParser(usage="%prog usage: giantbomb -hdluvMD [parameters]\n <game name or gameid number>\n\nFor details on using giantbomb from the command execute './giantbomb.py -u'. For details on the meaning of the XML element tags see the wiki page at:\nhttps://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format")
 
     parser.add_option(  "-d", "--debug", action="store_true", default=False, dest="debug",
-                        help=u"Show debugging info")
+                        help="Show debugging info")
     parser.add_option(  "-u", "--usage", action="store_true", default=False, dest="usage",
-                        help=u"Display examples for executing the giantbomb script")
+                        help="Display examples for executing the giantbomb script")
     parser.add_option(  "-v", "--version", action="store_true", default=False, dest="version",
-                        help=u"Display version and author")
-    parser.add_option(  "-l", "--language", metavar="LANGUAGE", default=u'en', dest="language",
-                        help=u"Select data that matches the specified language. At this time giantbomb.com only supports 'en' English.")
-    parser.add_option(  "-a", "--area", metavar="AREA", default=u"gb", dest="area",
-			help=u"Select data that matches the specified country. This option is currently not used.")
+                        help="Display version and author")
+    parser.add_option(  "-l", "--language", metavar="LANGUAGE", default='en', dest="language",
+                        help="Select data that matches the specified language. At this time giantbomb.com only supports 'en' English.")
+    parser.add_option(  "-a", "--area", metavar="AREA", default="gb", dest="area",
+			help="Select data that matches the specified country. This option is currently not used.")
     parser.add_option(  "-M", "--gamelist", action="store_true", default=False, dest="gamelist",
-                        help=u"Get matching Movie list")
+                        help="Get matching Movie list")
     parser.add_option(  "-D", "--gamedata", action="store_true", default=False, dest="gamedata",
-                        help=u"Get Movie metadata including graphic URLs")
+                        help="Get Movie metadata including graphic URLs")
 
     opts, args = parser.parse_args()
 
@@ -249,7 +240,7 @@ def main():
 
     # Process version command line requests
     if opts.version:
-        version = etree.XML(u'<grabber></grabber>')
+        version = etree.XML('<grabber></grabber>')
         etree.SubElement(version, "name").text = __title__
         etree.SubElement(version, "author").text = __author__
         etree.SubElement(version, "thumbnail").text = 'giantbomb.png'
@@ -269,7 +260,7 @@ def main():
         sys.stderr.write("! Error: There must be one value for any option. Your options are (%s)\n" % (args))
         sys.exit(1)
 
-    if args[0] == u'':
+    if args[0] == '':
         sys.stderr.write("! Error: There must be a non-empty argument, yours is empty.\n")
         sys.exit(1)
 
diff --git a/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_api.py b/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_api.py
index d4522cccd45..90a76bca12f 100644
--- a/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_api.py
+++ b/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_api.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: giantbomb_api.py  Simple-to-use Python interface to the GiantBomb's API (api.giantbomb.com)
 # Python Script
@@ -28,15 +27,10 @@
 import requests
 from copy import deepcopy
 
-IS_PY2 = sys.version_info[0] == 2
-if not IS_PY2:
-    unicode = str
-    unichr = chr
-
 from .giantbomb_exceptions import (GiantBombBaseError, GiantBombHttpError, GiantBombXmlError,  GiantBombGameNotFound,)
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -47,7 +41,7 @@ def __init__(self, outstream, encoding=None):
 
     def write(self, obj):
         """Wraps the output stream, encoding Unicode strings with the specified encoding"""
-        if isinstance(obj, unicode):
+        if isinstance(obj, str):
             obj = obj.encode(self.encoding)
         if IS_PY2:
             self.out.write(obj)
@@ -68,7 +62,7 @@ def __getattr__(self, attr):
         from io import StringIO
     from lxml import etree
 except Exception as e:
-    sys.stderr.write(u'\n! Error - Importing the "lxml" and "StringIO" python libraries failed on error(%s)\n' % e)
+    sys.stderr.write('\n! Error - Importing the "lxml" and "StringIO" python libraries failed on error(%s)\n' % e)
     sys.exit(1)
 
 # Check that the lxml library is current enough
@@ -80,7 +74,7 @@ def __getattr__(self, attr):
     version+=str(digit)+'.'
 version = version[:-1]
 if version < '2.7.2':
-    sys.stderr.write(u'''
+    sys.stderr.write('''
 ! Error - The installed version of the "lxml" python library "libxml" version is too old.
           At least "libxml" version 2.7.2 must be installed. Your version is (%s).
 ''' % version)
@@ -106,16 +100,16 @@ def __init__(self,
 
         self.config['apikey'] = apikey
         self.config['debug'] = debug
-        self.config['searchURL'] = u'https://www.giantbomb.com/api/search'
-        self.config['dataURL'] = u'https://www.giantbomb.com/api/game/%s'
+        self.config['searchURL'] = 'https://www.giantbomb.com/api/search'
+        self.config['dataURL'] = 'https://www.giantbomb.com/api/game/%s'
         # giantbomb.com now requires a unique 'User-Agent':
         self.config['headers'] = {"User-Agent": 'MythTV giantbomb grabber 0.2'}
 
-        self.error_messages = {'GiantBombHttpError': u"! Error: A connection error to api.giantbomb.com was raised (%s)\n", 'GiantBombXmlError': u"! Error: Invalid XML was received from api.giantbomb.com (%s)\n", 'GiantBombBaseError': u"! Error: An error was raised (%s)\n", }
+        self.error_messages = {'GiantBombHttpError': "! Error: A connection error to api.giantbomb.com was raised (%s)\n", 'GiantBombXmlError': "! Error: Invalid XML was received from api.giantbomb.com (%s)\n", 'GiantBombBaseError': "! Error: An error was raised (%s)\n", }
 
         self.baseProcessingDir = os.path.dirname( os.path.realpath( __file__ ))
 
-        self.pubDateFormat = u'%a, %d %b %Y %H:%M:%S GMT'
+        self.pubDateFormat = '%a, %d %b %Y %H:%M:%S GMT'
         self.xmlParser = etree.XMLParser(remove_blank_text=True)
 
         self.supportedJobList = ["actor", "author", "producer", "executive producer", "director", "cinematographer", "composer", "editor", "casting", "voice actor", "music", "writer", "technical director", "design director", ]
@@ -151,9 +145,9 @@ def fixup(m):
             if text[:2] == "&#":
                 try:
                     if text[:3] == "&#x":
-                        return unichr(int(text[3:-1], 16))
+                        return chr(int(text[3:-1], 16))
                     else:
-                        return unichr(int(text[2:-1]))
+                        return chr(int(text[2:-1]))
                 except ValueError:
                     pass
             elif text[:1] == "&":
@@ -165,14 +159,14 @@ def fixup(m):
                 if entity:
                     if entity[:2] == "&#":
                         try:
-                            return unichr(int(entity[2:-1]))
+                            return chr(int(entity[2:-1]))
                         except ValueError:
                             pass
                     else:
-                        return unicode(entity, "iso-8859-1")
+                        return str(entity, "iso-8859-1")
             return text # leave as is
         if IS_PY2:
-            text23 = self.ampReplace(re.sub(u"(?s)<[^>]*>|&#?\w+;", fixup, self.textUtf8(text))).replace(u'\n',u' ')
+            text23 = self.ampReplace(re.sub(r"(?s)<[^>]*>|&#?\w+;", fixup, self.textUtf8(text))).replace('\n',' ')
         else:
             text23 = self.ampReplace(re.sub(r"(?s)<[^>]*>|&#?\w+;", fixup, self.textUtf8(text))).replace('\n',' ')
         return text23
@@ -183,9 +177,9 @@ def textUtf8(self, text):
         if text is None:
             return text
         try:
-            return unicode(text, 'utf8')
+            return str(text, 'utf8')
         except UnicodeDecodeError:
-            return u''
+            return ''
         except (UnicodeEncodeError, TypeError):
             return text
     # end textUtf8()
@@ -195,7 +189,7 @@ def ampReplace(self, text):
         '''Replace all "&" characters with "&amp;"
         '''
         text = self.textUtf8(text)
-        return text.replace(u'&amp;',u'~~~~~').replace(u'&',u'&amp;').replace(u'~~~~~', u'&amp;')
+        return text.replace('&amp;','~~~~~').replace('&','&amp;').replace('~~~~~', '&amp;')
     # end ampReplace()
 
 
@@ -204,8 +198,8 @@ def htmlToString(self, context, html):
         return the string without HTML tags or LFs
         '''
         if not len(html):
-            return u""
-        return self.massageText(html).strip().replace(u'\n', u' ').replace(u'’', u"&apos;").replace(u'“', u"&apos;")
+            return ""
+        return self.massageText(html).strip().replace('\n', ' ').replace('’', "&apos;").replace('“', "&apos;")
     # end htmlToString()
 
     def getHtmlData(self, context, *args):
@@ -231,7 +225,7 @@ def getHtmlData(self, context, *args):
                 return filteredData[0]
             else:
                 return filteredData[0].text
-        return u''
+        return ''
     # end getHtmlData()
 
     def pubDate(self, context, *inputArgs):
@@ -243,19 +237,19 @@ def pubDate(self, context, *inputArgs):
         args = []
         for arg in inputArgs:
             args.append(arg)
-        if args[0] == u'':
+        if args[0] == '':
             return datetime.datetime.now().strftime(self.pubDateFormat)
         index = args[0].find('+')
         if index == -1:
             index = args[0].find('-')
         if index != -1 and index > 5:
             args[0] = args[0][:index].strip()
-        args[0] = args[0].replace(',', u'').replace('.', u'')
+        args[0] = args[0].replace(',', '').replace('.', '')
         try:
             if len(args) > 2:
                 pubdate = time.strptime(args[0], args[2])
             elif len(args) > 1:
-                args[1] = args[1].replace(',', u'').replace('.', u'')
+                args[1] = args[1].replace(',', '').replace('.', '')
                 if args[1].find('GMT') != -1:
                     args[1] = args[1][:args[1].find('GMT')].strip()
                     args[0] = args[0][:args[0].rfind(' ')].strip()
@@ -273,7 +267,7 @@ def pubDate(self, context, *inputArgs):
             else:
                 return datetime.datetime.now().strftime(self.pubDateFormat)
         except Exception as err:
-            sys.stderr.write(u'! Error: pubDate variables(%s) error(%s)\n' % (args, err))
+            sys.stderr.write('! Error: pubDate variables(%s) error(%s)\n' % (args, err))
         return args[0]
     # end pubDate()
 
@@ -296,16 +290,16 @@ def futureReleaseDate(self, context, gameElement):
             else:
                 month = None
         except:
-            return u''
+            return ''
         if not year:
-            return u''
+            return ''
         if month and not quarter:
-            pubdate = time.strptime((u'%s-%s-01' % (year, month)), '%Y-%m-%d')
+            pubdate = time.strptime(('%s-%s-01' % (year, month)), '%Y-%m-%d')
         elif not month and quarter:
-            month = str((int(quarter)*3))
-            pubdate = time.strptime((u'%s-%s-01' % (year, month)), '%Y-%m-%d')
+            month = str(int(quarter)*3)
+            pubdate = time.strptime(('%s-%s-01' % (year, month)), '%Y-%m-%d')
         else:
-            pubdate = time.strptime((u'%s-12-01' % (year, )), '%Y-%m-%d')
+            pubdate = time.strptime(('%s-12-01' % (year, )), '%Y-%m-%d')
 
         return time.strftime('%Y-%m-%d', pubdate)
     # end futureReleaseDate()
@@ -319,7 +313,7 @@ def makeImageElement(typeImage, url, thumb):
             ''' Create a single Image element
             return the image element
             '''
-            imageElement = etree.XML(u"<image></image>")
+            imageElement = etree.XML("<image></image>")
             imageElement.attrib['type'] = typeImage
             imageElement.attrib['url'] = url
             imageElement.attrib['thumb'] = thumb
@@ -332,22 +326,22 @@ def makeImageElement(typeImage, url, thumb):
             imageList = superImageFilter(imageElement)
             if len(imageList):
                 for image in imageList:
-                    self.imageElements.append(makeImageElement('coverart', image, image.replace(u'super', u'thumb')))
-        htmlElement = self.getHtmlData('dummy', etree.tostring(args[1][0], method="text", encoding=unicode).strip())
+                    self.imageElements.append(makeImageElement('coverart', image, image.replace('super', 'thumb')))
+        htmlElement = self.getHtmlData('dummy', etree.tostring(args[1][0], method="text", encoding=str).strip())
         if len(htmlElement):
             for image in htmlElement[0].xpath('.//a/img/@src'):
                 if image.find('screen') == -1:
                     continue
                 if image.find('thumb') == -1:
                     continue
-                self.imageElements.append(makeImageElement('screenshot', image.replace(u'thumb', u'super'), image))
+                self.imageElements.append(makeImageElement('screenshot', image.replace('thumb', 'super'), image))
 
         if len(args) > 2:
             for imageElement in args[2]:
                 imageList = superImageFilter(imageElement)
                 if len(imageList):
                     for image in imageList:
-                        self.imageElements.append(makeImageElement('screenshot', image, image.replace(u'super', u'thumb')))
+                        self.imageElements.append(makeImageElement('screenshot', image, image.replace('super', 'thumb')))
 
         if not len(self.imageElements):
             return False
@@ -428,10 +422,10 @@ def gameSearch(self, gameTitle):
         try:
             queryResult = etree.fromstring(res.content)
         except Exception as errmsg:
-            sys.stderr.write(u"! Error: Invalid XML was received from www.giantbomb.com (%s)\n" % errmsg)
+            sys.stderr.write("! Error: Invalid XML was received from www.giantbomb.com (%s)\n" % errmsg)
             sys.exit(1)
 
-        queryXslt = etree.XSLT(etree.parse(u'%s/XSLT/giantbombQuery.xsl' % self.baseProcessingDir))
+        queryXslt = etree.XSLT(etree.parse('%s/XSLT/giantbombQuery.xsl' % self.baseProcessingDir))
         gamebombXpath = etree.FunctionNamespace('https://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format')
         gamebombXpath.prefix = 'gamebombXpath'
         self.buildFuncDict()
@@ -465,10 +459,10 @@ def gameData(self, gameId):
         try:
             videoResult = etree.fromstring(res.content)
         except Exception as errmsg:
-            sys.stderr.write(u"! Error: Invalid XML was received from www.giantbomb.com (%s)\n" % errmsg)
+            sys.stderr.write("! Error: Invalid XML was received from www.giantbomb.com (%s)\n" % errmsg)
             sys.exit(1)
 
-        gameXslt = etree.XSLT(etree.parse(u'%s/XSLT/giantbombGame.xsl' % self.baseProcessingDir))
+        gameXslt = etree.XSLT(etree.parse('%s/XSLT/giantbombGame.xsl' % self.baseProcessingDir))
         gamebombXpath = etree.FunctionNamespace('https://www.mythtv.org/wiki/MythTV_Universal_Metadata_Format')
         gamebombXpath.prefix = 'gamebombXpath'
         self.buildFuncDict()
@@ -493,10 +487,10 @@ def main():
     api_key = "b5883a902a8ed88b15ce21d07787c94fd6ad9f33"
     gamebomb = gamedbQueries(api_key)
     # Output a dictionary of matching movie titles
-    gamebomb.gameSearch(u'Grand')
+    gamebomb.gameSearch('Grand')
     print()
     # Output a dictionary of matching movie details for GiantBomb number '19995'
-    gamebomb.gameData(u'19995')
+    gamebomb.gameData('19995')
 # end main()
 
 if __name__ == '__main__':
diff --git a/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_exceptions.py b/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_exceptions.py
index ce7eb4542f2..7dd7c862ef9 100644
--- a/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_exceptions.py
+++ b/mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_exceptions.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: giantbomb_exceptions - Custom exceptions used or raised by giantbomb_api
 # Python Script
diff --git a/mythtv/bindings/python/MythTV/__init__.py b/mythtv/bindings/python/MythTV/__init__.py
index 886d68d08f0..1985bf77c29 100644
--- a/mythtv/bindings/python/MythTV/__init__.py
+++ b/mythtv/bindings/python/MythTV/__init__.py
@@ -1,4 +1,3 @@
-
 __all_exceptions__  = ['MythError', 'MythDBError', 'MythBEError', \
                        'MythFEError', 'MythFileError', 'MythTZError']
 
diff --git a/mythtv/bindings/python/MythTV/_conn_mysqldb.py b/mythtv/bindings/python/MythTV/_conn_mysqldb.py
index 6f50433036b..03027bc466e 100644
--- a/mythtv/bindings/python/MythTV/_conn_mysqldb.py
+++ b/mythtv/bindings/python/MythTV/_conn_mysqldb.py
@@ -8,7 +8,7 @@
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     import MySQLdb, MySQLdb.cursors
-if (MySQLdb.version_info < (1,2,3)) and (sys.version_info >= (2,7)):
+if MySQLdb.version_info < (1,2,3):
     raise ImportError('MySQLdb is too old for this version of Python')
 
 __version__ = tuple(['MySQLdb']+list(MySQLdb.version_info))
@@ -32,7 +32,7 @@ class LoggedCursor( MySQLdb.cursors.Cursor ):
     Custom cursor, offering logging and error handling
     """
     def __init__(self, connection):
-        super(LoggedCursor, self).__init__(connection)
+        super().__init__(connection)
         self.log = None
         self.ping = ref(self._ping121)
         if MySQLdb.version_info >= (1, 2, 2):
@@ -73,8 +73,8 @@ def execute(self, query, args=None):
         self.log_query(query, args)
         try:
             if args is None:
-                return super(LoggedCursor, self).execute(query)
-            return super(LoggedCursor, self).execute(query, args)
+                return super().execute(query)
+            return super().execute(query, args)
         except Exception as e:
             raise MythDBError(MythDBError.DB_RAW, e.args)
 
@@ -99,7 +99,7 @@ def executemany(self, query, args):
         query = self._sanitize(query)
         self.log_query(query, args)
         try:
-            return super(LoggedCursor, self).executemany(query, args)
+            return super().executemany(query, args)
         except Exception as e:
             raise MythDBError(MythDBError.DB_RAW, e.args)
 
diff --git a/mythtv/bindings/python/MythTV/altdict.py b/mythtv/bindings/python/MythTV/altdict.py
index a7080480d53..8df0a71fda0 100644
--- a/mythtv/bindings/python/MythTV/altdict.py
+++ b/mythtv/bindings/python/MythTV/altdict.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides tweaked dict-type classes."""
 
 from MythTV.exceptions import MythError
diff --git a/mythtv/bindings/python/MythTV/connections.py b/mythtv/bindings/python/MythTV/connections.py
index 9ecd2645776..21ee7e85eb4 100644
--- a/mythtv/bindings/python/MythTV/connections.py
+++ b/mythtv/bindings/python/MythTV/connections.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides basic connection classes."""
 
 from MythTV.static import SCHEMA_VERSION, PROTO_VERSION, PROTO_TOKEN, BACKEND_SEP
@@ -18,7 +17,6 @@
 import queue
 import json
 import re
-from builtins import str
 
 # Note: Support for oursql was removed in MythTV v32
 try:
@@ -27,7 +25,7 @@
 except:
     raise MythError("No viable database module found.")
 
-class _Connection_Pool( object ):
+class _Connection_Pool:
     """
     Provides a scaling connection pool to access a shared resource.
     """
@@ -119,7 +117,7 @@ def __init__(self, dbconn):
         self._refs = {}
 
         self.log(MythLog.DATABASE, MythLog.INFO,
-                        "Attempting connection: {0}".format(dbconn.ident))
+                        "Attempting connection: {}".format(dbconn.ident))
         try:
             _Connection_Pool.__init__(self)
         except:
@@ -171,7 +169,7 @@ def __exit__(self, type, value, traceback):
             cursor.commit()
         cursor.close()
 
-class BEConnection( object ):
+class BEConnection:
     """
     This is the basic backend connection object.
     You probably don't want to use this directly.
@@ -196,7 +194,7 @@ def __init__(self, backend, port, localname=None,
 
         try:
             self.connect()
-        except socket.error as e:
+        except OSError as e:
             self.log.logTB(MythLog.SOCKET)
             self.connected = False
             self.log(MythLog.GENERAL, MythLog.CRIT,
@@ -340,13 +338,13 @@ def __init__(self, backend, port, localname=None, deadline=10.0, level=2):
         self.threadrunning = False
         self.eventqueue = queue.Queue()
 
-        super(BEEventConnection, self).__init__(backend, port, localname,
+        super().__init__(backend, port, localname,
                                                 False, deadline)
 
     def connect(self):
         if self.connected:
             return
-        super(BEEventConnection, self).connect()
+        super().connect()
         if len(self._regevents) and (not self.threadrunning):
             start_new_thread(self.eventloop, ())
 
@@ -435,9 +433,9 @@ def eventloop(self):
     def backendCommand(self, data, deadline=None):
         if self._announced:
             return ""
-        return super(BEEventConnection, self).backendCommand(data, deadline)
+        return super().backendCommand(data, deadline)
 
-class FEConnection( object ):
+class FEConnection:
     """
     This is the basic frontend connection object.
     You probably dont want to use this directly.
@@ -544,13 +542,13 @@ def recv(self, deadline=None):
         prompt = re.compile(b'([\r\n.]*)\r\n# ')
         try:
             res = self.socket.dlexpect(prompt, deadline=deadline)
-        except socket.error:
+        except OSError:
             raise MythFEError(MythError.FE_CONNECTION, self.host, self.port)
         except KeyboardInterrupt:
             raise
         return prompt.split(res)[0].decode('utf-8')
 
-class XMLConnection( object ):
+class XMLConnection:
     """
     XMLConnection(backend=None, db=None, port=None) -> Backend status object
 
@@ -608,7 +606,7 @@ def _request(self, path='', **keyvars):
         url = 'http://{0.host}:{0.port}/{1}'.format(self, path)
         if keyvars:
             url += '?' + '&'.join(
-                        ['{0}={1}'.format(k,urllib.request.quote(v))
+                        ['{}={}'.format(k,urllib.request.quote(v))
                                 for k,v in keyvars.items()])
         self.log(self.log.NETWORK, self.log.DEBUG, 'Generating request', url)
         return self._Request(url)
@@ -618,7 +616,7 @@ def getConnectionInfo(self, pin=0):
         dbconn = {'SecurityPin':pin}
         try:
             dat = self._request('Myth/GetConnectionInfo', \
-                                        Pin='{0:0>4}'.format(pin)).readJSON()
+                                        Pin='{:0>4}'.format(pin)).readJSON()
             return dat['ConnectionInfo']['Database']
         except:
             return {}
diff --git a/mythtv/bindings/python/MythTV/database.py b/mythtv/bindings/python/MythTV/database.py
index d2a6763835d..6db56968983 100644
--- a/mythtv/bindings/python/MythTV/database.py
+++ b/mythtv/bindings/python/MythTV/database.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provides connection cache and data handlers for accessing the database.
 """
@@ -19,7 +17,6 @@
 import time as _pyt
 import weakref
 import os
-from builtins import int, str
 
 
 class DBData( DictData, MythSchema ):
@@ -274,7 +271,7 @@ class DBDataWrite( DBData ):
     @classmethod
     def _setClassDefs(cls, db=None):
         db = DBCache(db)
-        super(DBDataWrite, cls)._setClassDefs(db)
+        super()._setClassDefs(db)
         if cls._defaults is None:
             cls._defaults = {}
         create = cls._create_normal
@@ -797,8 +794,8 @@ def _picklelist(self):
         self._populate()
         return [a.values()+[a._cref] for a in self.copy()]
 
-class DatabaseConfig( object ):
-    class _WakeOnLanConfig( object ):
+class DatabaseConfig:
+    class _WakeOnLanConfig:
         def __init__(self):
             self.enabled = False
             self.waittime = 0
@@ -902,17 +899,17 @@ def test(self, log):
             obj.confdir = confdir
             if obj.readXML(confdir):
                 log(log.GENERAL, log.DEBUG,
-                          "Trying database credentials from: {0}"\
+                          "Trying database credentials from: {}"\
                                 .format(os.path.join(confdir,'config.xml')))
                 yield obj
             elif obj.readOldXML(confdir):
                 log(log.GENERAL, log.DEBUG,
-                          "Trying old format database credentials from: {0}"\
+                          "Trying old format database credentials from: {}"\
                                 .format(os.path.join(confdir,'config.xml')))
                 yield obj
             else:
                 log(log.GENERAL, log.DEBUG,
-                          "Failed to read database credentials from: {0}"\
+                          "Failed to read database credentials from: {}"\
                                 .format(os.path.join(confdir,'config.xml')))
 
         homedir = os.environ.get('HOME', '')
@@ -921,17 +918,17 @@ def test(self, log):
             obj.confdir = os.path.join(homedir, '.mythtv')
             if obj.readXML(os.path.join(homedir,'.mythtv')):
                 log(log.GENERAL, log.DEBUG,
-                          "Trying database credentials from: {0}"\
+                          "Trying database credentials from: {}"\
                                 .format(os.path.join(homedir,'config.xml')))
                 yield obj
             elif obj.readOldXML(os.path.join(homedir, '.mythtv')):
                 log(log.GENERAL, log.DEBUG,
-                          "Trying old format database credentials from: {0}"\
+                          "Trying old format database credentials from: {}"\
                                 .format(os.path.join(homedir,'config.xml')))
                 yield obj
             else:
                 log(log.GENERAL, log.DEBUG,
-                          "Failed to read database credentials from: {0}"\
+                          "Failed to read database credentials from: {}"\
                                 .format(os.path.join(homedir,'config.xml')))
 
         # try UPnP
@@ -939,12 +936,12 @@ def test(self, log):
             obj = self.copy()
             if obj.readUPNP(conn):
                 log(log.GENERAL, log.DEBUG,
-                          "Trying database credentials from: {0}"\
+                          "Trying database credentials from: {}"\
                                 .format(conn.host))
                 yield obj
             else:
                 log(log.GENERAL, log.DEBUG,
-                          "Failed to read database credentials from: {0}"\
+                          "Failed to read database credentials from: {}"\
                                 .format(conn.host))
 
         # try defaults if user did not specify anything
@@ -1055,7 +1052,7 @@ def writeXML(self, log):
 
         confdir = os.environ.get('MYTHCONFDIR', '')
         if confdir and (confdir != '/'):
-            log(log.GENERAL, log.DEBUG, "Writing new database credentials: {0}"\
+            log(log.GENERAL, log.DEBUG, "Writing new database credentials: {}"\
                                 .format(os.path.join(confdir,'config.xml')))
             fp = open(os.path.join(confdir,'config.xml'), 'w')
             self.confdir = confdir
@@ -1063,7 +1060,7 @@ def writeXML(self, log):
             homedir = os.environ.get('HOME', '')
             if homedir and (homedir != '/'):
                 log(log.GENERAL, log.DEBUG,
-                        "Writing new database credentials: {0}"\
+                        "Writing new database credentials: {}"\
                                 .format(os.path.join(homedir,'config.xml')))
                 fp = open(os.path.join(homedir, '.mythtv', 'config.xml'), 'w')
                 self.confdir = os.path.join(homedir, '.mythtv')
diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
index 6025bfaa92f..0392ac5932c 100644
--- a/mythtv/bindings/python/MythTV/dataheap.py
+++ b/mythtv/bindings/python/MythTV/dataheap.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provides data access classes for accessing and managing MythTV data
 """
@@ -67,7 +65,7 @@ def __new__(cls, attr, parent=None, imagetype=None):
             # return a dumb string
             return str.__new__(str, attr)
         else:
-            return super(Artwork, cls).__new__(cls)
+            return super().__new__(cls)
 
     def __init__(self, attr, parent=None, imagetype=None):
         self.attr = attr
@@ -128,7 +126,7 @@ class Record( CMPRecord, DBDataWrite, RECTYPE ):
     @classmethod
     def _setClassDefs(cls, db=None):
         db = DBCache(db)
-        super(Record, cls)._setClassDefs(db)
+        super()._setClassDefs(db)
         defaults = cls._template('Default', db=db)
         for k,v in list(defaults.items()):
             cls._defaults[k] = v
@@ -962,7 +960,7 @@ class Video( CMPVideo, VideoSchema, DBDataWrite ):
     @classmethod
     def _setClassDefs(cls, db=None):
         db = DBCache(db)
-        super(Video, cls)._setClassDefs(db)
+        super()._setClassDefs(db)
         cls._fill_cm(db)
 
     @classmethod
diff --git a/mythtv/bindings/python/MythTV/exceptions.py b/mythtv/bindings/python/MythTV/exceptions.py
index 21e80f46c34..3ed8114e3ed 100644
--- a/mythtv/bindings/python/MythTV/exceptions.py
+++ b/mythtv/bindings/python/MythTV/exceptions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides custom error codes"""
 
 from MythTV.static import ERRCODES
@@ -191,7 +190,7 @@ def __init__(self, *args):
         if args[0] == self.TZ_ERROR:
             self.ename = 'TZ_ERROR'
             self.ecode, self.reason = args
-            self.args = ("Error processing time zone: {0}".format(self.reason))
+            self.args = ("Error processing time zone: {}".format(self.reason))
         elif args[0] == self.TZ_INVALID_FILE:
             self.ename = 'TZ_INVALID_FILE'
             self.ecode, = args
diff --git a/mythtv/bindings/python/MythTV/logging.py b/mythtv/bindings/python/MythTV/logging.py
index f09422fef53..b46dae39915 100644
--- a/mythtv/bindings/python/MythTV/logging.py
+++ b/mythtv/bindings/python/MythTV/logging.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides managed logging."""
 
 from MythTV.static import LOGLEVEL, LOGMASK, LOGFACILITY
@@ -250,7 +249,7 @@ def __new__(cls, *args, **kwargs):
         # abuse the __new__ constructor to set some immutable class attributes
         # before the class is instantiated
         cls._initlogger()
-        return super(MythLog, cls).__new__(cls)
+        return super().__new__(cls)
 
     def __init__(self, module='pythonbindings', db=None):
         self.module = module
@@ -286,7 +285,7 @@ def _setfile(cls, filename):
     @classmethod
     def _setpath(cls, filepath):
         cls._initlogger()
-        cls._setfile(os.path.join(filepath, "{0}.{1}.{2}.log"\
+        cls._setfile(os.path.join(filepath, "{}.{}.{}.log"\
                             .format(argv[0].split('/')[-1],
                                     datetime.now().strftime('%Y%m%d%H%M%S'),
                                     os.getpid())))
@@ -459,17 +458,17 @@ def _logfile(self, mask, level, message, detail):
 
     def _logsyslog(self, mask, level, message, detail):
         syslog.syslog(level,
-                      message + (' -- {0}'.format(detail) if detail else ''))
+                      message + (' -- {}'.format(detail) if detail else ''))
 
     def _logjournallog(self, mask, level, message, detail):
         if detail:
-            detail = ' -- {0}'.format(detail)
+            detail = ' -- {}'.format(detail)
         else:
             detail = ''
         application = argv[0]
         if '/' in application:
             application = application.rsplit('/', 1)[1]
-        msg = ("[{0}]: {1}{2}".format(self.module, message, detail))
+        msg = ("[{}]: {}{}".format(self.module, message, detail))
         journal.send(msg, PRIORITY=level, SYSLOG_IDENTIFIER=application )
 
     def __call__(self, mask, level, message, detail=None):
diff --git a/mythtv/bindings/python/MythTV/methodheap.py b/mythtv/bindings/python/MythTV/methodheap.py
index 7bfdf16e77d..5552bbf45f0 100644
--- a/mythtv/bindings/python/MythTV/methodheap.py
+++ b/mythtv/bindings/python/MythTV/methodheap.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provides base classes for accessing MythTV
 """
@@ -425,7 +423,7 @@ class BEEventMonitor( BECache ):
     def __init__(self, backend=None, blockshutdown=False,
                        systemevents=False, db=None):
         self.systemevents = systemevents
-        super(BEEventMonitor, self).__init__(backend, blockshutdown, True, db)
+        super().__init__(backend, blockshutdown, True, db)
 
     def _listhandlers(self):
         return [self.eventMonitor]
@@ -440,7 +438,7 @@ def eventMonitor(self, event=None):
         self.log(MythLog.ALL, MythLog.INFO, event)
 
 class MythSystemEvent( BECache ):
-    class systemeventhandler( object ):
+    class systemeventhandler:
         # decorator class for system events
         bs = BACKEND_SEP.replace('[',r'\[').replace(']',r'\]')
         re_process = re.compile(bs.join([
@@ -506,7 +504,7 @@ def _listhandlers(self):
 
     def __init__(self, backend=None, blockshutdown=False, db=None,
                        enablehandler=True):
-        super(MythSystemEvent, self).__init__(backend, blockshutdown, True, db)
+        super().__init__(backend, blockshutdown, True, db)
 
         if enablehandler:
             self._events.append(self._generic_handler)
@@ -521,7 +519,7 @@ def _generic_handler(self, event):
 
 class Frontend( FEConnection ):
     _db = None
-    class _Jump( object ):
+    class _Jump:
         def __str__(self):  return str(self.list())
         def __repr__(self): return str(self)
 
@@ -554,7 +552,7 @@ def list(self):
             self._populate()
             return self._points.items()
 
-    class _Key( object ):
+    class _Key:
         _keymap = { 9:'tab',        10:'enter',     27:'escape',
                     32:'space',     92:'backslash', 127:'backspace',
                     258:'down',     259:'up',       260:'left',
@@ -915,7 +913,7 @@ def searchGuide(self, init=False, key=None, value=None):
         if key.endswith('date'):
             prefix = {'on':'=', 'before':'<', 'after':'>'}
             if key[:-4] in prefix:
-                return ('DATE(program.starttime){0}?'.format(prefix[key[:-4]]),
+                return ('DATE(program.starttime){}?'.format(prefix[key[:-4]]),
                         value, 0)
 
         if key == 'startbefore':
@@ -1017,7 +1015,7 @@ def scanVideos(self):
         """
         obj.scanVideo() --> list of new, moved, and deleted Videos
         """
-        startvids = dict([(vid.intid, vid) for vid in Video.getAllEntries(db=self)])
+        startvids = {vid.intid: vid for vid in Video.getAllEntries(db=self)}
 
         be = MythBE(db=self)
         r = re.compile(re.escape(BACKEND_SEP).\
diff --git a/mythtv/bindings/python/MythTV/msearch.py b/mythtv/bindings/python/MythTV/msearch.py
index 99d14a277a7..3d42c0f5eea 100644
--- a/mythtv/bindings/python/MythTV/msearch.py
+++ b/mythtv/bindings/python/MythTV/msearch.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides tools for UPNP searches"""
 
 from MythTV.exceptions import MythError
@@ -7,7 +6,7 @@
 from time import time
 import socket
 
-class MSearch( object ):
+class MSearch:
     """
     Opens a socket for performing UPNP searches.
     """
@@ -25,7 +24,7 @@ def __init__(self):
                 self.sock.bind(('', port))
                 self.addr = (addr, port)
                 listening = True
-            except socket.error as e:
+            except OSError as e:
                 if port < 1910:
                     port += 1
                 else:
@@ -65,7 +64,7 @@ def search(self, timeout=5.0, filter=None):
         while (time()<atime) and self._runsearch:
             try:
                 sdata, saddr = sock.recvfrom(2048)
-            except socket.error:
+            except OSError:
                 continue #no data, continue
             sdata = sdata.decode('utf-8')
 
diff --git a/mythtv/bindings/python/MythTV/mythproto.py b/mythtv/bindings/python/MythTV/mythproto.py
index a09eb7b0fb1..935cd5a3175 100644
--- a/mythtv/bindings/python/MythTV/mythproto.py
+++ b/mythtv/bindings/python/MythTV/mythproto.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provides connection cache and data handlers for accessing the backend.
 """
@@ -24,7 +22,7 @@
 import os
 
 
-class BECache( object ):
+class BECache:
     """
     BECache(backend=None, noshutdown=False, db=None)
                                             -> MythBackend connection object
@@ -44,7 +42,7 @@ class BECache( object ):
                               and returns the response.
     """
 
-    class _ConnHolder( object ):
+    class _ConnHolder:
         blockshutdown = 0
         command = None
         event = None
@@ -746,7 +744,7 @@ def allocateEventLock(self, regex):
             regex = re.compile(regex)
         return EventLock(regex, self.hostname, self.db)
 
-    class _ProgramQuery( object ):
+    class _ProgramQuery:
         def __init__(self, query, header_length=0, sorted=False,
                      recstatus=None, handler=None):
             self.query = query
@@ -1071,7 +1069,7 @@ def __init__(self, regex, backend=None, db=None):
         self.regex = regex
         self._lock = allocate_lock()
         self._lock.acquire()
-        super(EventLock, self).__init__(backend, False, True, db)
+        super().__init__(backend, False, True, db)
 
     def _listhandlers(self):
         return [self._unlock]
diff --git a/mythtv/bindings/python/MythTV/services_api/__init__.py b/mythtv/bindings/python/MythTV/services_api/__init__.py
index c9dab4baf1c..3130cb449f1 100644
--- a/mythtv/bindings/python/MythTV/services_api/__init__.py
+++ b/mythtv/bindings/python/MythTV/services_api/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 """ MythTV Services API interface. """
diff --git a/mythtv/bindings/python/MythTV/services_api/send.py b/mythtv/bindings/python/MythTV/services_api/send.py
index 621a9af8fa1..2d597e21f22 100644
--- a/mythtv/bindings/python/MythTV/services_api/send.py
+++ b/mythtv/bindings/python/MythTV/services_api/send.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """API Client."""
 
 from os import fdopen
@@ -21,7 +19,7 @@
 from .mythversions import MYTHTV_VERSION_LIST
 
 
-class Send(object):
+class Send:
     """Services API."""
 
     def __init__(self, host, port=6544):
diff --git a/mythtv/bindings/python/MythTV/services_api/utilities.py b/mythtv/bindings/python/MythTV/services_api/utilities.py
index c8f95e86c2a..56da6d96cd5 100644
--- a/mythtv/bindings/python/MythTV/services_api/utilities.py
+++ b/mythtv/bindings/python/MythTV/services_api/utilities.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """API utilities."""
 
 from datetime import datetime, timedelta
diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
index 434c3ec94ca..bc775ccdddf 100644
--- a/mythtv/bindings/python/MythTV/static.py
+++ b/mythtv/bindings/python/MythTV/static.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Contains static and global variables for MythTV Python Bindings.
 Version information is placed in '_versions.py'.
@@ -7,7 +5,7 @@
 
 from MythTV._versions import *
 
-class MARKUP( object ):
+class MARKUP:
     MARK_UNSET            = -10
     MARK_TMP_CUT_END      = -5
     MARK_TMP_CUT_START    = -4
@@ -37,7 +35,7 @@ class MARKUP( object ):
     MARK_UTIL_PROGSTART   = 40
     MARK_UTIL_LASTPLAYPOS = 41
 
-class RECTYPE( object ):
+class RECTYPE:
     kNotRecording       = 0
     kSingleRecord       = 1
     kDailyRecord        = 2
@@ -51,7 +49,7 @@ class RECTYPE( object ):
     #kFindWeeklyRecord   = 10 (Obsolete)
     kTemplateRecord     = 11
 
-class RECSEARCHTYPE( object ):
+class RECSEARCHTYPE:
     kNoSearch           = 0
     kPowerSearch        = 1
     kTitleSearch        = 2
@@ -59,7 +57,7 @@ class RECSEARCHTYPE( object ):
     kPeopleSearch       = 4
     kManualSearch       = 5
 
-class RECSTATUS( object ):
+class RECSTATUS:
     rsPending           = -15
     rsFailing           = -14
     rsTuning            = -10
@@ -86,7 +84,7 @@ class RECSTATUS( object ):
     rsNeverRecord       = 11
     rsOffline           = 12
 
-class AUDIO_PROPS( object ):
+class AUDIO_PROPS:
     AUD_UNKNOWN         = 0x00
     AUD_STEREO          = 0x01
     AUD_MONO            = 0x02
@@ -95,7 +93,7 @@ class AUDIO_PROPS( object ):
     AUD_HARDHEAR        = 0x10
     AUD_VISUALIMPAIR    = 0x20
 
-class VIDEO_PROPS( object ):
+class VIDEO_PROPS:
     VID_UNKNOWN         = 0x0000
     VID_WIDESCREEN      = 0x0001
     VID_HDTV            = 0x0002
@@ -109,14 +107,14 @@ class VIDEO_PROPS( object ):
     VID_PROGRESSIVE     = 0x0200
     VID_DAMAGED         = 0x0400
 
-class SUBTITLE_TYPES( object ):
+class SUBTITLE_TYPES:
     SUB_UNKNOWN         = 0x00
     SUB_HARDHEAR        = 0x01
     SUB_NORMAL          = 0x02
     SUB_ONSCREEN        = 0x04
     SUB_SIGNED          = 0x08
 
-class CAST_ROLES( object ):
+class CAST_ROLES:
     UNKNOWN            = 0x0000
     ACTOR              = 0x0001
     DIRECTOR           = 0x0002
@@ -130,7 +128,7 @@ class CAST_ROLES( object ):
     COMMENTATOR        = 0x0200
     GUEST              = 0x0400
 
-class JOBTYPE( object ):
+class JOBTYPE:
     NONE         = 0x0000
     SYSTEMJOB    = 0x00ff
     TRANSCODE    = 0x0001
@@ -143,21 +141,21 @@ class JOBTYPE( object ):
     USERJOB3     = 0x0400
     USERJOB4     = 0x0800
 
-class JOBCMD( object ):
+class JOBCMD:
     RUN          = 0x0000
     PAUSE        = 0x0001
     RESUME       = 0x0002
     STOP         = 0x0004
     RESTART      = 0x0008
 
-class JOBFLAG( object ):
+class JOBFLAG:
     NO_FLAGS     = 0x0000
     USE_CUTLIST  = 0x0001
     LIVE_REC     = 0x0002
     EXTERNAL     = 0x0004
     REBUILD      = 0x0008
 
-class JOBSTATUS( object ):
+class JOBSTATUS:
     UNKNOWN      = 0x0000
     QUEUED       = 0x0001
     PENDING      = 0x0002
@@ -174,7 +172,7 @@ class JOBSTATUS( object ):
     ERRORED      = 0x0130
     CANCELLED    = 0x0140
 
-class LOGMASK( object ):
+class LOGMASK:
     ALL         = 0b111111111111111111111111111
     MOST        = 0b011111111110111111111111111
     NONE        = 0b000000000000000000000000000
@@ -207,7 +205,7 @@ class LOGMASK( object ):
     SYSTEM      = 0b010000000000000000000000000
     TIMESTAMP   = 0b100000000000000000000000000
 
-class LOGLEVEL( object ):
+class LOGLEVEL:
     ANY         = -1
     EMERG       = 0
     ALERT       = 1
@@ -219,7 +217,7 @@ class LOGLEVEL( object ):
     DEBUG       = 7
     UNKNOWN     = 8
 
-class LOGFACILITY( object ):
+class LOGFACILITY:
     KERN        = 1
     USER        = 2
     MAIL        = 3
@@ -238,7 +236,7 @@ class LOGFACILITY( object ):
     LOCAL6      = 16
     LOCAL7      = 17
 
-class ERRCODES( object ):
+class ERRCODES:
     GENERIC                 = 0
     SYSTEM                  = 1
     SOCKET                  = 2
@@ -265,7 +263,7 @@ class ERRCODES( object ):
     TZ_CONVERSION_ERROR     = 253
     TZ_VERSION_ERROR        = 254
 
-class MythSchema( object ):
+class MythSchema:
     _schema_value = 'DBSchemaVer'
     _schema_local = SCHEMA_VERSION
     _schema_name = 'Database'
@@ -274,7 +272,7 @@ class MythSchema( object ):
 class VideoSchema( MythSchema ):
     pass
 
-class MusicSchema( object ):
+class MusicSchema:
     _schema_value = 'MusicDBSchemaVer'
     _schema_local = MUSICSCHEMA_VERSION
     _schema_name = 'MythMusic'
diff --git a/mythtv/bindings/python/MythTV/system.py b/mythtv/bindings/python/MythTV/system.py
index 6623b10c217..943e356fc42 100644
--- a/mythtv/bindings/python/MythTV/system.py
+++ b/mythtv/bindings/python/MythTV/system.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 """
 Provides base classes for managing system calls.
 """
@@ -26,7 +24,7 @@ class System( DBCache ):
     """
     logmodule = 'Python system call handler'
 
-    class Process( object ):
+    class Process:
         def __init__(self, cmd, useshell, log):
             self.cmd = cmd
             self.log = log
@@ -348,7 +346,7 @@ def _processMetadata(self, xml):
             yield self.cls(item)
 
     def command(self, *args):
-        return self._processMetadata(super(Grabber, self).command(*args))
+        return self._processMetadata(super().command(*args))
 
     def search(self, phrase, subtitle=None, tolerance=None, func=None):
         """
diff --git a/mythtv/bindings/python/MythTV/utility/altdict.py b/mythtv/bindings/python/MythTV/utility/altdict.py
index 0656b1add72..145909a6bcd 100644
--- a/mythtv/bindings/python/MythTV/utility/altdict.py
+++ b/mythtv/bindings/python/MythTV/utility/altdict.py
@@ -11,7 +11,6 @@
 #                 For the classes 'DictInvert' and 'DictInvertCI', please use the imports
 #                 'from MythTV.altdict import DictInvert, DictInvertCI'
 
-from builtins import map, zip
 from warnings import warn
 
 class OrdDict( dict ):
diff --git a/mythtv/bindings/python/MythTV/utility/dequebuffer.py b/mythtv/bindings/python/MythTV/utility/dequebuffer.py
index a4b229f0328..e05773fe194 100644
--- a/mythtv/bindings/python/MythTV/utility/dequebuffer.py
+++ b/mythtv/bindings/python/MythTV/utility/dequebuffer.py
@@ -24,7 +24,7 @@ def __init__(self, group=None, target=None, name=None,
                            args=(), kwargs={}):
             self.inputqueue = Queue()
             self.idletime = time()
-            super(_PollingThread, self).__init__(group,
+            super().__init__(group,
                         target, name, args, kwargs)
         def add_pipe(self, buff, pipe, mode):
             self.inputqueue.put((buff, pipe, mode))
@@ -96,7 +96,7 @@ def __init__(self, group=None, target=None, name=None,
                            args=(), kwargs={}):
             self.inputqueue = Queue()
             self.idletime = time()
-            super(_PollingThread, self).__init__(group,
+            super().__init__(group,
                         target, name, args, kwargs)
         def add_pipe(self, buff, pipe, mode):
             self.inputqueue.put((buff, pipe, mode))
@@ -158,14 +158,14 @@ def run(self):
                 else:
                     self.idletime = time()
 
-class DequeBuffer( object ):
+class DequeBuffer:
     """
     This is a chunked buffer, storing a sequence of buffer objects in a
     deque, allowing for FIFO operations outside the limited 64K system
     buffer, and the efficient freeing of memory without needing to rewrite
     a large contiguous buffer object.
     """
-    class _Buffer( object ):
+    class _Buffer:
         """
         This subclass contains a buffer object and a read/write lock, as
         well as independent read and write positions.
diff --git a/mythtv/bindings/python/MythTV/utility/dicttoxml.py b/mythtv/bindings/python/MythTV/utility/dicttoxml.py
index 3c1d2eb8754..79f33000eb7 100644
--- a/mythtv/bindings/python/MythTV/utility/dicttoxml.py
+++ b/mythtv/bindings/python/MythTV/utility/dicttoxml.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 """
 Converts a Python dictionary or other native data type into a valid XML string.
 
@@ -8,7 +6,6 @@
 This module works with both Python 2 and 3.
 """
 
-from __future__ import unicode_literals
 
 __version__ = '1.7.4'
 version = __version__
@@ -17,7 +14,7 @@
 try:
     from collections.abc import Iterable
 except ImportError:
-    from collections import Iterable
+    from collections.abc import Iterable
 import numbers
 import logging
 from xml.dom.minidom import parseString
diff --git a/mythtv/bindings/python/MythTV/utility/dt.py b/mythtv/bindings/python/MythTV/utility/dt.py
index de04d537c98..9a6ec6f1765 100644
--- a/mythtv/bindings/python/MythTV/utility/dt.py
+++ b/mythtv/bindings/python/MythTV/utility/dt.py
@@ -351,29 +351,29 @@ def fromDatetime(cls, dt, tzinfo=None):
     def now(cls, tz=None):
         if tz is None:
             tz = cls.localTZ()
-        obj = super(datetime, cls).now(tz)
+        obj = super().now(tz)
         return cls.fromDatetime(obj)
 
     @classmethod
     def utcnow(cls):
-        obj = super(datetime, cls).utcnow()
+        obj = super().utcnow()
         return obj.replace(tzinfo=cls.UTCTZ())
 
     @classmethod
     def fromtimestamp(cls, timestamp, tz=None):
         if tz is None:
             tz = cls.localTZ()
-        obj = super(datetime, cls).fromtimestamp(float(timestamp), tz)
+        obj = super().fromtimestamp(float(timestamp), tz)
         return cls.fromDatetime(obj)
 
     @classmethod
     def utcfromtimestamp(cls, timestamp):
-        obj = super(datetime, cls).utcfromtimestamp(float(timestamp))
+        obj = super().utcfromtimestamp(float(timestamp))
         return obj.replace(tzinfo=cls.UTCTZ())
 
     @classmethod
     def strptime(cls, datestring, format, tzinfo=None):
-        obj = super(datetime, cls).strptime(datestring, format)
+        obj = super().strptime(datestring, format)
         return cls.fromDatetime(obj, tzinfo)
 
 # new class methods for interfacing with MythTV
@@ -394,7 +394,7 @@ def frommythtime(cls, mtime, tz=None):
     def fromIso(cls, isotime, sep='T', tz=None):
         match = cls._reiso.match(isotime)
         if match is None:
-            raise TypeError("time data '{0}' does not match ISO 8601 format" \
+            raise TypeError("time data '{}' does not match ISO 8601 format" \
                                 .format(isotime))
 
         dt = [int(a) for a in match.groups()[:5]]
@@ -425,7 +425,7 @@ def fromIso(cls, isotime, sep='T', tz=None):
     def fromRfc(cls, rfctime, tz=None):
         match = cls._rerfc.match(rfctime)
         if match is None:
-            raise TypeError("time data '{0}' does not match RFC 822 format"\
+            raise TypeError("time data '{}' does not match RFC 822 format"\
                                 .format(rfctime))
 
         year = int(match.group('year'))
@@ -526,7 +526,7 @@ def utcisoformat(self):
         return self.astimezone(self.UTCTZ()).isoformat().split('+')[0]
 
     def astimezone(self, tz):
-        return self.fromDatetime(super(datetime, self).astimezone(tz))
+        return self.fromDatetime(super().astimezone(tz))
 
     def asnaiveutc(self):
         return self.astimezone(self.UTCTZ()).replace(tzinfo=None)
diff --git a/mythtv/bindings/python/MythTV/utility/enum.py b/mythtv/bindings/python/MythTV/utility/enum.py
index 0f12d6cce58..c127183ee72 100644
--- a/mythtv/bindings/python/MythTV/utility/enum.py
+++ b/mythtv/bindings/python/MythTV/utility/enum.py
@@ -10,10 +10,9 @@
 #                 removed after the release of MythTV v32!
 #                 Please use the class 'IntEnum' from the module 'enum' provided by python3.
 
-from builtins import int
 from warnings import warn
 
-class EnumValue( object ):
+class EnumValue:
     _next = 0
     _storage = []
     def __init__(self, name, value=None, friendly_name=None):
@@ -30,8 +29,8 @@ def _incr(cls, value):
         if value is not None:
             if cls._next:
                 # this should be zero
-                raise RuntimeError(("Cannot mix specified and auto-increment "
-                                    "values in same Enum"))
+                raise RuntimeError("Cannot mix specified and auto-increment "
+                                    "values in same Enum")
             return value
         # increment and continue
         self._next += 1
@@ -58,7 +57,7 @@ def __getattr__(cls, key):
             return cls(cls._values[key].value)
         raise AttributeError(key)
 
-class BaseEnum( object, metaclass=EnumType ):
+class BaseEnum(metaclass=EnumType ):
 
     def __init__(self, mode):
         warn("Class 'BaseEnum' and it descendants will be removed after MythTV v32 release, "
diff --git a/mythtv/bindings/python/MythTV/utility/mixin.py b/mythtv/bindings/python/MythTV/utility/mixin.py
index 118182de6b5..2e1d8cfc657 100644
--- a/mythtv/bindings/python/MythTV/utility/mixin.py
+++ b/mythtv/bindings/python/MythTV/utility/mixin.py
@@ -4,7 +4,7 @@
 # Description: Provides mixin's for assorted methods
 #------------------------------
 
-class CMPVideo( object ):
+class CMPVideo:
     """
     Utility class providing comparison operators between data objects
         containing video metadata.  
@@ -223,12 +223,12 @@ def __lt__(self, other):
         if not (hasattr(self, 'chanid') or hasattr(other, 'chanid')):
             # either object is not a recording-related object
             # fall through to video matching
-            return super(CMPRecord, self).__lt__(other)
+            return super().__lt__(other)
 
         # select attributes to use for comparison
         l,r = self.__choose_comparison(self, other)
         if None in (l,r):
-            return super(CMPRecord, self).__lt__(other)
+            return super().__lt__(other)
 
         # generate comparison function, and return result
         check = lambda s,o: (s.chanid, s[l]) < (o.chanid, o[l])
@@ -244,11 +244,11 @@ def __eq__(self, other):
             pass
 
         if not (hasattr(self, 'chanid') or hasattr(other, 'chanid')):
-            return super(CMPRecord, self).__eq__(other)
+            return super().__eq__(other)
 
         l,r = self.__choose_comparison(self, other)
         if None in (l,r):
-            return super(CMPRecord, self).__eq__(other)
+            return super().__eq__(other)
 
         check = lambda s,o: (s.chanid, s[l]) == (o.chanid, o[l])
         self._eq__[type(other)] = check
@@ -263,11 +263,11 @@ def __gt__(self, other):
             pass
 
         if not (hasattr(self, 'chanid') or hasattr(other, 'chanid')):
-            return super(CMPRecord, self).__gt__(other)
+            return super().__gt__(other)
 
         l,r = self.__choose_comparison(self, other)
         if None in (l,r):
-            return super(CMPRecord, self).__gt__(other)
+            return super().__gt__(other)
 
         check = lambda s,o: (s.chanid, s[l]) > (o.chanid, o[l])
         self._gt__[type(other)] = check
diff --git a/mythtv/bindings/python/MythTV/utility/other.py b/mythtv/bindings/python/MythTV/utility/other.py
index 497bff767e0..4e4e603ebcc 100644
--- a/mythtv/bindings/python/MythTV/utility/other.py
+++ b/mythtv/bindings/python/MythTV/utility/other.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """Provides decorator classes for assorted functions"""
 
 from MythTV.logging import MythLog
@@ -7,17 +6,15 @@
 from io import BytesIO
 from select import select
 from time import time
-from builtins import map
 import weakref
 import socket
 import re
 import sys
-from builtins import range
 
 def _donothing(*args, **kwargs):
     pass
 
-class SchemaUpdate( object ):
+class SchemaUpdate:
     # TODO: do locking and lock checking
     #       if interactive terminal, ask for update permission
     #       perform database backup (partial?)
@@ -67,7 +64,7 @@ def run(self):
     def create(self):
         raise MythDBError('Schema creation failed, method not defined.')
 
-class databaseSearch( object ):
+class databaseSearch:
     # decorator class for database searches
     """
     Decorator class
@@ -113,7 +110,7 @@ class databaseSearch( object ):
                 4-field  -- Special response consisting of:
                     (see example in methodheap.py:MythDB.searchRecorded)
     """
-    class Join( object ):
+    class Join:
         def __init__(self, table=None, tableto=None, fields=None, \
                            fieldsto=None, fieldsfrom=None):
             if (table is None) or (tableto is None) or \
@@ -331,7 +328,7 @@ def dlrecv(self, bufsize, flags=0, deadline=None):
             p = buff.tell()
             try:
                 buff.write(self.recv(bufsize-buff.tell(), flags))
-            except socket.error as e:
+            except OSError as e:
                 raise MythError(MythError.SOCKET, e.args)
             if buff.tell() == p:
                # no data read from a 'ready' socket, connection terminated
@@ -363,7 +360,7 @@ def dlexpect(self, pattern, flags=0, deadline=None):
             p = buff.tell()
             try:
                 buff.write(self.recv(100, flags))
-            except socket.error as e:
+            except OSError as e:
                 raise MythError(MythError.SOCKET, e.args)
             if buff.tell() == p:
                 # no data read from a 'ready' socket, connection terminated
@@ -394,10 +391,10 @@ def sendheader(self, data, flags=0):
             length = b'%-8d' % len(data)
             data = b"".join([length, data])
             self.send(data, flags)
-        except socket.error as e:
+        except OSError as e:
             raise MythError(MythError.SOCKET, e.args)
 
-class MARKUPLIST( object ):
+class MARKUPLIST:
     """
     Utility class for building seek/cutlists from video markup data.
     """
@@ -445,7 +442,7 @@ def levenshtein(s1, s2):
 
     return previous_row[-1]
 
-class ParseEnum( object ):
+class ParseEnum:
     _static = None
     def __str__(self):
         return str([k for k,v in self.iteritems() if v==True])
@@ -511,8 +508,8 @@ def __init__(self, parent, field_name, editable=True):
         if field[:4] != 'set(':
             raise MythDBError("ParseSet error. "+\
                         "Field '%s' not of type 'set()'" % self._field)
-        self._enum = dict([(t,2**i) for i,t in enumerate([type.strip("'")\
-                                for type in field[4:-1].split(',')])])
+        self._enum = {t:2**i for i,t in enumerate([type.strip("'")\
+                                for type in field[4:-1].split(',')])}
         self._static = not editable
 
     def __getattr__(self, name):
@@ -569,7 +566,7 @@ def check_ipv6(n):
     try:
         socket.inet_pton(socket.AF_INET6, n)
         return True
-    except socket.error:
+    except OSError:
         return False
 
 def resolve_ip(host, port):
@@ -589,7 +586,7 @@ def py3_str(value, ignore_errors=False):
     except TypeError:  # Wasn't a bytes object, no need to decode
         return str(value)
 
-class QuickProperty( object ):
+class QuickProperty:
     def __init__(self, maskedvar, default=None, handler=None):
         self.varname = maskedvar
         self.default = default
diff --git a/mythtv/bindings/python/MythTV/utility/singleton.py b/mythtv/bindings/python/MythTV/utility/singleton.py
index 7a2657b786b..11571f1da06 100644
--- a/mythtv/bindings/python/MythTV/utility/singleton.py
+++ b/mythtv/bindings/python/MythTV/utility/singleton.py
@@ -11,13 +11,13 @@ class Singleton( type ):
     """
     def __new__(mcs, name, bases, kwargs):
         if '__slots__' in kwargs:
-            kwargs['__slots__']['_{0}__instance'.format(name)] = None
+            kwargs['__slots__']['_{}__instance'.format(name)] = None
         else:
-            kwargs['_{0}__instance'.format(name)] = None
+            kwargs['_{}__instance'.format(name)] = None
         return type.__new__(mcs, name, bases, kwargs)
 
     def __call__(cls, *args, **kwargs):
-        attr = '_{0}__instance'.format(cls.__name__)
+        attr = '_{}__instance'.format(cls.__name__)
         inst = getattr(cls, attr)
         if inst:
             return inst
@@ -32,13 +32,13 @@ class InputSingleton( type ):
     """
     def __new__(mcs, name, bases, kwargs):
         if '__slots__' in kwargs:
-            kwargs['__slots__']['_{0}__instance'.format(name)] = {}
+            kwargs['__slots__']['_{}__instance'.format(name)] = {}
         else:
-            kwargs['_{0}__instance'.format(name)] = {}
+            kwargs['_{}__instance'.format(name)] = {}
         return type.__new__(mcs, name, bases, kwargs)
 
     def __call__(cls, *args, **kwargs):
-        attr = '_{0}__instance'.format(cls.__name__)
+        attr = '_{}__instance'.format(cls.__name__)
         insts = getattr(cls, attr)
 
         from inspect import getcallargs
@@ -57,13 +57,13 @@ class CmpSingleton( type ):
     """
     def __new__(mcs, name, bases, kwargs):
         if '__slots__' in kwargs:
-            kwargs['__slots__']['_{0}__instance'.format(name)] = []
+            kwargs['__slots__']['_{}__instance'.format(name)] = []
         else:
-            kwargs['_{0}__instance'.format(name)] = []
+            kwargs['_{}__instance'.format(name)] = []
         return type.__new__(mcs, name, bases, kwargs)
 
     def __call__(cls, *args, **kwargs):
-        attr = '_{0}__instance'.format(cls.__name__)
+        attr = '_{}__instance'.format(cls.__name__)
         insts = getattr(cls, attr)
         obj = type.__call__(cls, *args, **kwargs)
         for inst in insts:
diff --git a/mythtv/bindings/python/MythTV/wikiscripts/__init__.py b/mythtv/bindings/python/MythTV/wikiscripts/__init__.py
index cbc611a36bb..a04b814851f 100644
--- a/mythtv/bindings/python/MythTV/wikiscripts/__init__.py
+++ b/mythtv/bindings/python/MythTV/wikiscripts/__init__.py
@@ -1,4 +1,3 @@
-
 from .wikiscripts import *
 
 
diff --git a/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py b/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py
index ec25f39e3df..87d18855737 100644
--- a/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py
+++ b/mythtv/bindings/python/MythTV/wikiscripts/wikiscripts.py
@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #----------------------
 
 try:
@@ -27,7 +26,6 @@
 import sys
 import stat
 
-from builtins import input
 
 BASEURL = 'https://www.mythtv.org/wiki'
 
@@ -35,8 +33,8 @@ def getScripts():
     return Script.getAll()
 
 def getPage(**kwargs):
-    url = "{0}?{1}".format(BASEURL,
-            '&'.join(['{0}={1}'.format(k,v) for k,v in list(kwargs.items())]))
+    url = "{}?{}".format(BASEURL,
+            '&'.join(['{}={}'.format(k,v) for k,v in list(kwargs.items())]))
     return lxml.html.parse(urlopen(url)).getroot()
 
 def getWhatLinksHere(page):
@@ -47,7 +45,7 @@ def getWhatLinksHere(page):
         links.append('_'.join(link.find('a').text.split(' ')))
     return links
 
-class Script( object ):
+class Script:
     _cache   = None
     _queue   = Queue.Queue()
     _pool    = []
@@ -104,7 +102,7 @@ def __cmp__(self, other):
             return 0
 
     def __repr__(self):
-        return '<Script {0} at {1}>'.format(self.url, hex(id(self)))
+        return '<Script {} at {}>'.format(self.url, hex(id(self)))
 
     def __init__(self, url, refresh=False, pool=4):
         self.url = url
@@ -202,12 +200,8 @@ def _loadCache(cls, refresh):
         if refresh:
             cls._cache = {}
             return
-        if (sys.version_info[0] == 2):
-            path = '/tmp/mythwikiscripts.pickle'
-            fmode = 'r'
-        else:
-            path = '/tmp/mythwikiscripts.pickle3'
-            fmode = 'rb'
+        path = '/tmp/mythwikiscripts.pickle3'
+        fmode = 'rb'
         if os.access(path, os.F_OK):
             try:
                 fd = open(path, fmode)
@@ -223,14 +217,9 @@ def _loadCache(cls, refresh):
     def _dumpCache(cls):
         ### XXX ToDo allign pickle protocol versions
         try:
-            if (sys.version_info[0] == 2):
-                path = '/tmp/mythwikiscripts.pickle'
-                fd = open(path,'w')
-                cls._cache = pickle.dump(cls._cache,fd)
-            else:
-                path = '/tmp/mythwikiscripts.pickle3'
-                fd = open(path,'wb')
-                cls._cache = pickle.dump(cls._cache,fd,  protocol=1)
+            path = '/tmp/mythwikiscripts.pickle3'
+            fd = open(path,'wb')
+            cls._cache = pickle.dump(cls._cache,fd,  protocol=1)
             fd.close()
         except:
             os.remove(path)
diff --git a/mythtv/bindings/python/setup.py b/mythtv/bindings/python/setup.py
index cbe6779ddae..4c6837fbb43 100755
--- a/mythtv/bindings/python/setup.py
+++ b/mythtv/bindings/python/setup.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import sys, os
 import setuptools
 
diff --git a/mythtv/bindings/python/tmdb3/scripts/populate_locale.py b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py
index 45f3281ba54..a1a9b1114ae 100755
--- a/mythtv/bindings/python/tmdb3/scripts/populate_locale.py
+++ b/mythtv/bindings/python/tmdb3/scripts/populate_locale.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: populate_locale.py    Helper for grabbing ISO639 and ISO3316 data
 # Python Library
@@ -18,7 +17,7 @@ def sanitize(name):
 fpath = os.path.join(os.getcwd(), __file__) if not __file__.startswith('/') else __file__
 fpath = os.path.join(fpath.rsplit('/', 2)[0], 'tmdb3/locales.py')
 
-fd = open(fpath, 'r')
+fd = open(fpath)
 while True:
     line = fd.readline()
     if len(line) == 0:
@@ -42,14 +41,14 @@ def sanitize(name):
     if row.getchildren()[-1].text == "\xa0":
         # skip empty 639-1 code
         continue
-    name, _, _, iso639_2, iso639_1 = [t.text for t in row]
+    name, _, _, iso639_2, iso639_1 = (t.text for t in row)
 
-    fd.write('Language("{0}", "{1}", u"{2}")\n'.format(iso639_1, iso639_2, sanitize(name).encode('utf8')))
+    fd.write('Language("{}", "{}", u"{}")\n'.format(iso639_1, iso639_2, sanitize(name).encode('utf8')))
 
 root = lxml.html.parse('http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm').getroot()
 for row in root.get_element_by_id('tc_list'):
     if row.tag == 'thead':
         # skip header
         continue
-    name, _, alpha2 = [t.text if t.text else t.getchildren()[0].tail for t in row]
-    fd.write('Country("{0}", u"{1}")\n'.format(alpha2, sanitize(name).encode('utf8')))
+    name, _, alpha2 = (t.text if t.text else t.getchildren()[0].tail for t in row)
+    fd.write('Country("{}", u"{}")\n'.format(alpha2, sanitize(name).encode('utf8')))
diff --git a/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py
index 820831f6701..0e002f6b6b5 100755
--- a/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py
+++ b/mythtv/bindings/python/tmdb3/scripts/pytmdb3.py
@@ -1,4 +1,3 @@
-
 from optparse import OptionParser
 from tmdb3 import *
 
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/__init__.py b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py
index 591b6e24265..f891a836bca 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/__init__.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/__init__.py
@@ -1,4 +1,3 @@
-
 from .tmdb_api import Configuration, searchMovie, searchMovieWithYear, \
                      searchPerson, searchStudio, searchList, searchCollection, \
                      searchSeries, Person, Movie, Collection, Genre, List, \
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/cache.py b/mythtv/bindings/python/tmdb3/tmdb3/cache.py
index 9c211cf352a..436ca7a55cb 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/cache.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/cache.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: cache.py
 # Python Library
@@ -16,7 +15,7 @@
 from . import cache_file
 
 
-class Cache(object):
+class Cache:
     """
     This class implements a cache framework, allowing selecting of a
     pluggable engine. The framework stores data in a key/value manner,
@@ -80,7 +79,7 @@ def cached(self, callback):
         """
         return self.Cached(self, callback)
 
-    class Cached( object ):
+    class Cached:
         def __init__(self, cache, callback, func=None, inst=None):
             self.cache = cache
             self.callback = callback
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py
index 36a033374b2..20d9a7819c6 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: cache_engine.py
 # Python Library
@@ -11,7 +10,7 @@
 import sys
 
 
-class Engines(object):
+class Engines:
     """
     Static collector for engines to register against.
     """
@@ -37,13 +36,13 @@ class CacheEngineType(type):
     for named selection and use.
     """
     def __init__(cls, name, bases, attrs):
-        super(CacheEngineType, cls).__init__(name, bases, attrs)
+        super().__init__(name, bases, attrs)
         if name != 'CacheEngine':
             # skip base class
             Engines.register(cls)
 
 
-class CacheEngine(object, metaclass=CacheEngineType):
+class CacheEngine(metaclass=CacheEngineType):
 
     name = 'unspecified'
 
@@ -60,7 +59,7 @@ def expire(self, key):
         raise RuntimeError
 
 
-class CacheObject(object):
+class CacheObject:
     """
     Cache object class, containing one stored record.
     """
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py
index f847005146c..faf1a719c92 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/cache_file.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: cache_file.py
 # Python Library
@@ -58,7 +57,7 @@ def _donothing(*args, **kwargs):
 
 try:
     import fcntl
-    class Flock(object):
+    class Flock:
         """
         Context manager to flock file for the duration the object
         exists. Referenced file will be automatically unflocked as the
@@ -99,7 +98,7 @@ def parse_filename(filename):
 
 except ImportError:
     import msvcrt
-    class Flock( object ):
+    class Flock:
         LOCK_EX = msvcrt.LK_LOCK
         LOCK_SH = msvcrt.LK_LOCK
 
@@ -153,7 +152,7 @@ def __init__(self, *args, **kwargs):
         self._data = None
         self._size = None
         self._buff = StringIO()
-        super(FileCacheObject, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     @property
     def size(self):
@@ -217,7 +216,7 @@ class FileEngine( CacheEngine ):
     _version = 2
 
     def __init__(self, parent):
-        super(FileEngine, self).__init__(parent)
+        super().__init__(parent)
         self.configure(None)
 
     def configure(self, filename, preallocate=256):
@@ -243,13 +242,13 @@ def _init_cache(self):
             if not os.access(self.cachefile, os.W_OK):
                 raise TMDBCacheWriteError(self.cachefile)
 
-        except IOError as e:
+        except OSError as e:
             if e.errno == errno.ENOENT:
                 # file does not exist, create a new one
                 try:
                     self._open('w+b')
                     self._write([])
-                except IOError as e:
+                except OSError as e:
                     if e.errno == errno.ENOENT:
                         # directory does not exist
                         raise TMDBCacheDirectoryError(self.cachefile)
@@ -298,7 +297,7 @@ def _open(self, mode='r+b'):
                 return
         except:
             pass  # catch issue of no cachefile yet opened
-        self.cachefd = io.open(self.cachefile, mode)
+        self.cachefd = open(self.cachefile, mode)
 
     def _read(self, date):
         try:
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py
index 8eaee8a6894..26cabec06ef 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/cache_null.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: cache_null.py
 # Python Library
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/locales.py b/mythtv/bindings/python/tmdb3/tmdb3/locales.py
index 3253c6f5a27..a58b2f138f2 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/locales.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/locales.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: locales.py    Stores locale information for filtering results
 # Python Library
@@ -11,7 +10,7 @@
 syslocale = None
 
 
-class LocaleBase(object):
+class LocaleBase:
     __slots__ = ['__immutable']
     _stored = {}
     fallthrough = False
@@ -25,13 +24,13 @@ def __setattr__(self, key, value):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__setattr__(key, value)
+        super().__setattr__(key, value)
 
     def __delattr__(self, key):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__delattr__(key)
+        super().__delattr__(key)
 
     def __lt__(self, other):
         return (id(self) != id(other)) and (str(self) > str(other))
@@ -49,7 +48,7 @@ def getstored(cls, key):
         try:
             return cls._stored[key.lower()]
         except:
-            raise TMDBLocaleError("'{0}' is not a known valid {1} code."\
+            raise TMDBLocaleError("'{}' is not a known valid {} code."\
                                   .format(key, cls.__name__))
 
 
@@ -64,7 +63,7 @@ def __init__(self, iso1, iso2, ename):
 #        self.ISO639_2B = iso2b
         self.englishname = ename
 #        self.nativename = nname
-        super(Language, self).__init__(iso1, iso2)
+        super().__init__(iso1, iso2)
 
     def __str__(self):
         return self.ISO639_1
@@ -80,7 +79,7 @@ class Country(LocaleBase):
     def __init__(self, alpha2, name):
         self.alpha2 = alpha2
         self.name = name
-        super(Country, self).__init__(alpha2)
+        super().__init__(alpha2)
 
     def __str__(self):
         return self.alpha2
@@ -98,7 +97,7 @@ def __init__(self, language, country, encoding):
         self.encoding = encoding if encoding else 'latin-1'
 
     def __str__(self):
-        return "{0}_{1}".format(self.language, self.country)
+        return "{}_{}".format(self.language, self.country)
 
     def __repr__(self):
         return "<Locale {0.language}_{0.country}>".format(self)
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/lookup.py b/mythtv/bindings/python/tmdb3/tmdb3/lookup.py
index 7ac547f4758..b49e6301731 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/lookup.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/lookup.py
@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: tmdb3.py
 # Python Script
@@ -125,12 +124,12 @@ def buildSingle(inetref, opts):
         m.countries.append(country.name)
     for cast in movie.cast:
         d = {'name':cast.name, 'character':cast.character, 'department':'Actors',
-             'job':'Actor', 'url':'http://www.themoviedb.org/people/{0}'.format(cast.id)}
+             'job':'Actor', 'url':'http://www.themoviedb.org/people/{}'.format(cast.id)}
         if cast.profile: d['thumb'] = cast.profile.geturl()
         m.people.append(d)
     for crew in movie.crew:
         d = {'name':crew.name, 'job':crew.job, 'department':crew.department,
-             'url':'http://www.themoviedb.org/people/{0}'.format(crew.id)}
+             'url':'http://www.themoviedb.org/people/{}'.format(crew.id)}
         if crew.profile: d['thumb'] = crew.profile.geturl()
         m.people.append(d)
     for backdrop in movie.backdrops:
@@ -377,17 +376,17 @@ def buildEpisode(args, opts):
 
     for cast in episode.cast:
         d = {'name':cast.name, 'character':cast.character, 'department':'Actors',
-             'job':'Actor', 'url':'http://www.themoviedb.org/people/{0}'.format(cast.id)}
+             'job':'Actor', 'url':'http://www.themoviedb.org/people/{}'.format(cast.id)}
         if cast.profile: d['thumb'] = cast.profile.geturl()
         m.people.append(d)
     for crew in episode.crew:
         d = {'name':crew.name, 'job':crew.job, 'department':crew.department,
-             'url':'http://www.themoviedb.org/people/{0}'.format(crew.id)}
+             'url':'http://www.themoviedb.org/people/{}'.format(crew.id)}
         if crew.profile: d['thumb'] = crew.profile.geturl()
         m.people.append(d)
     for guest in episode.guest_stars:
         d = {'name':guest.name, 'job':"Guest Star",
-             'url':'http://www.themoviedb.org/people/{0}'.format(guest.id)}
+             'url':'http://www.themoviedb.org/people/{}'.format(guest.id)}
         if guest.profile: d['thumb'] = guest.profile.geturl()
         m.people.append(d)
     if episode.still:
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/pager.py b/mythtv/bindings/python/tmdb3/tmdb3/pager.py
index 90e2b850145..fe51a85dfb5 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/pager.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/pager.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: pager.py    List-like structure designed for handling paged results
 # Python Library
@@ -26,7 +25,7 @@ def __next__(self):
     next = __next__  # for Python2
 
 
-class UnpagedData(object):
+class UnpagedData:
     def copy(self):
         return self.__class__()
 
@@ -104,7 +103,7 @@ def __init__(self, request, handler=None):
         self._request = request
         if handler:
             self._handler = handler
-        super(PagedRequest, self).__init__(self._getpage(1), 20)
+        super().__init__(self._getpage(1), 20)
 
     def _getpage(self, page):
         req = self._request.new(page=page)
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/request.py b/mythtv/bindings/python/tmdb3/tmdb3/request.py
index 27f06537e26..457c068a9ff 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/request.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/request.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: tmdb_request.py
 # Python Library
@@ -66,14 +65,14 @@ def __init__(self, url, **kwargs):
         """
         kwargs['api_key'] = self.api_key
         self._url = url.lstrip('/')
-        self._kwargs = dict([(kwa, kwv) for kwa, kwv in list(kwargs.items())
-                                        if kwv is not None])
+        self._kwargs = {kwa: kwv for kwa, kwv in list(kwargs.items())
+                                        if kwv is not None}
 
         locale = get_locale()
         kwargs = {}
         for k, v in list(self._kwargs.items()):
             kwargs[k] = locale.encode(v)
-        url = '{0}{1}?{2}'\
+        url = '{}{}?{}'\
                 .format(self._base_url, self._url, urlencode(kwargs))
 
         _py3Request.__init__(self, url)
@@ -136,7 +135,7 @@ def readJSON(self):
                     if data.get('status_code', 1) ==25:
                         # Sleep and retry query.
                         if DEBUG:
-                            print('Retry after {0} seconds'.format(max(float(e.headers['retry-after']),10)))
+                            print('Retry after {} seconds'.format(max(float(e.headers['retry-after']),10)))
                         time.sleep(max(float(e.headers['retry-after']),10))
                         continue
                     else:
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py
index a1f993847fa..83023705926 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: tmdb_api.py    Simple-to-use Python interface to TMDB's API v3
 # Python Library
@@ -156,7 +155,7 @@ class MovieSearchResult(SearchRepr, PagedRequest):
     def __init__(self, request, locale=None):
         if locale is None:
             locale = get_locale()
-        super(MovieSearchResult, self).__init__(
+        super().__init__(
                     request.new(language=locale.language),
                     lambda x: Movie(raw=x, locale=locale))
 
@@ -172,7 +171,7 @@ class SeriesSearchResult(SearchRepr, PagedRequest):
     def __init__(self, request, locale=None):
         if locale is None:
             locale = get_locale()
-        super(SeriesSearchResult, self).__init__(
+        super().__init__(
                     request.new(language=locale.language),
                     lambda x: Series_base(raw=x, locale=locale))
 
@@ -185,7 +184,7 @@ class PeopleSearchResult(SearchRepr, PagedRequest):
     """Stores a list of search matches."""
     _name = None
     def __init__(self, request):
-        super(PeopleSearchResult, self).__init__(
+        super().__init__(
                     request, lambda x: Person(raw=x))
 
 
@@ -197,7 +196,7 @@ class StudioSearchResult(SearchRepr, PagedRequest):
     """Stores a list of search matches."""
     _name = None
     def __init__(self, request):
-        super(StudioSearchResult, self).__init__(
+        super().__init__(
                     request, lambda x: Studio(raw=x))
 
 
@@ -209,7 +208,7 @@ class ListSearchResult(SearchRepr, PagedRequest):
     """Stores a list of search matches."""
     _name = None
     def __init__(self, request):
-        super(ListSearchResult, self).__init__(
+        super().__init__(
                     request, lambda x: List(raw=x))
 
 
@@ -224,7 +223,7 @@ class CollectionSearchResult(SearchRepr, PagedRequest):
     def __init__(self, request, locale=None):
         if locale is None:
             locale = get_locale()
-        super(CollectionSearchResult, self).__init__(
+        super().__init__(
                     request.new(language=locale.language),
                     lambda x: Collection(raw=x, locale=locale))
 
@@ -246,7 +245,7 @@ def geturl(self, size='original'):
         if size not in self.sizes():
             raise TMDBImageSizeError
         url = Configuration.images['base_url'].rstrip('/')
-        return url+'/{0}/{1}'.format(size, self.filename)
+        return url+'/{}/{}'.format(size, self.filename)
 
     # sort preferring locale's language, but keep remaining ordering consistent
     def __lt__(self, other):
@@ -370,13 +369,13 @@ def __repr__(self):
         return "<{0.__class__.__name__} '{0.name}'>".format(self)
 
     def _populate(self):
-        return Request('person/{0}'.format(self.id))
+        return Request('person/{}'.format(self.id))
 
     def _populate_credits(self):
-        return Request('person/{0}/credits'.format(self.id),
+        return Request('person/{}/credits'.format(self.id),
                        language=self._locale.language)
     def _populate_images(self):
-        return Request('person/{0}/images'.format(self.id))
+        return Request('person/{}/images'.format(self.id))
 
     roles = Datalist('cast', handler=lambda x: ReverseCast(raw=x),
                      poller=_populate_credits)
@@ -425,7 +424,7 @@ class Trailer(Element):
 
 class YoutubeTrailer(Trailer):
     def geturl(self):
-        return "http://www.youtube.com/watch?v={0}".format(self.source)
+        return "http://www.youtube.com/watch?v={}".format(self.source)
 
     def __repr__(self):
         # modified BASE64 encoding, no need to worry about unicode
@@ -465,7 +464,7 @@ class Genre(NameRepr, Element):
     name = Datapoint('name')
 
     def _populate_movies(self):
-        return Request('genre/{0}/movies'.format(self.id), \
+        return Request('genre/{}/movies'.format(self.id), \
                        language=self._locale.language)
 
     @property
@@ -498,10 +497,10 @@ class Studio(NameRepr, Element):
     parent = Datapoint('parent_company', handler=lambda x: Studio(raw=x))
 
     def _populate(self):
-        return Request('company/{0}'.format(self.id))
+        return Request('company/{}'.format(self.id))
 
     def _populate_movies(self):
-        return Request('company/{0}/movies'.format(self.id),
+        return Request('company/{}/movies'.format(self.id),
                        language=self._locale.language)
 
     # FIXME: add a cleaner way of adding types with no additional processing
@@ -562,7 +561,7 @@ def favorites(cls, session=None):
             session = get_session()
         account = Account(session=session)
         res = MovieSearchResult(
-                    Request('account/{0}/favorite_movies'.format(account.id),
+                    Request('account/{}/favorite_movies'.format(account.id),
                             session_id=session.sessionid))
         res._name = "Favorites"
         return res
@@ -573,7 +572,7 @@ def ratedmovies(cls, session=None):
             session = get_session()
         account = Account(session=session)
         res = MovieSearchResult(
-                    Request('account/{0}/rated_movies'.format(account.id),
+                    Request('account/{}/rated_movies'.format(account.id),
                             session_id=session.sessionid))
         res._name = "Movies You Rated"
         return res
@@ -584,7 +583,7 @@ def watchlist(cls, session=None):
             session = get_session()
         account = Account(session=session)
         res = MovieSearchResult(
-                    Request('account/{0}/movie_watchlist'.format(account.id),
+                    Request('account/{}/movie_watchlist'.format(account.id),
                             session_id=session.sessionid))
         res._name = "Movies You're Watching"
         return res
@@ -594,10 +593,10 @@ def fromIMDB(cls, imdbid, locale=None):
         try:
             # assume string
             if not imdbid.startswith('tt'):
-                imdbid = "tt{0:0>7}".format(imdbid)
+                imdbid = "tt{:0>7}".format(imdbid)
         except AttributeError:
             # assume integer
-            imdbid = "tt{0:0>7}".format(imdbid)
+            imdbid = "tt{:0>7}".format(imdbid)
         if locale is None:
             locale = get_locale()
         movie = cls(imdbid, locale=locale)
@@ -634,40 +633,40 @@ def fromIMDB(cls, imdbid, locale=None):
     languages = Datalist('spoken_languages', handler=Language)
 
     def _populate(self):
-        return Request('movie/{0}'.format(self.id), \
+        return Request('movie/{}'.format(self.id), \
                        language=self._locale.language)
 
     def _populate_titles(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['country'] = self._locale.country
-        return Request('movie/{0}/alternative_titles'.format(self.id),
+        return Request('movie/{}/alternative_titles'.format(self.id),
                        **kwargs)
 
     def _populate_cast(self):
-        return Request('movie/{0}/casts'.format(self.id))
+        return Request('movie/{}/casts'.format(self.id))
 
     def _populate_images(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['language'] = self._locale.language
-        return Request('movie/{0}/images'.format(self.id), **kwargs)
+        return Request('movie/{}/images'.format(self.id), **kwargs)
 
     def _populate_keywords(self):
-        return Request('movie/{0}/keywords'.format(self.id))
+        return Request('movie/{}/keywords'.format(self.id))
 
     def _populate_releases(self):
-        return Request('movie/{0}/releases'.format(self.id))
+        return Request('movie/{}/releases'.format(self.id))
 
     def _populate_cert_releases(self):
         return Request(f"movie/{self.id}/release_dates")
 
     def _populate_trailers(self):
-        return Request('movie/{0}/trailers'.format(self.id),
+        return Request('movie/{}/trailers'.format(self.id),
                             language=self._locale.language)
 
     def _populate_translations(self):
-        return Request('movie/{0}/translations'.format(self.id))
+        return Request('movie/{}/translations'.format(self.id))
 
     alternate_titles = Datalist('titles', handler=AlternateTitle, \
                                 poller=_populate_titles, sort=True)
@@ -695,7 +694,7 @@ def _populate_translations(self):
                             poller=_populate_translations)
 
     def setFavorite(self, value):
-        req = Request('account/{0}/favorite'.format(
+        req = Request('account/{}/favorite'.format(
                         Account(session=self._session).id),
                       session_id=self._session.sessionid)
         req.add_data({'movie_id': self.id,
@@ -706,14 +705,14 @@ def setFavorite(self, value):
     def setRating(self, value):
         if not (0 <= value <= 10):
             raise TMDBError("Ratings must be between '0' and '10'.")
-        req = Request('movie/{0}/rating'.format(self.id),
+        req = Request('movie/{}/rating'.format(self.id),
                       session_id=self._session.sessionid)
         req.lifetime = 0
         req.add_data({'value':value})
         req.readJSON()
 
     def setWatchlist(self, value):
-        req = Request('account/{0}/movie_watchlist'.format(
+        req = Request('account/{}/movie_watchlist'.format(
                         Account(session=self._session).id),
                       session_id=self._session.sessionid)
         req.lifetime = 0
@@ -727,30 +726,30 @@ def getSimilar(self):
     @property
     def similar(self):
         res = MovieSearchResult(Request(
-                                 'movie/{0}/similar_movies'.format(self.id)),
+                                 'movie/{}/similar_movies'.format(self.id)),
                                  locale=self._locale)
-        res._name = 'Similar to {0}'.format(self._printable_name())
+        res._name = 'Similar to {}'.format(self._printable_name())
         return res
 
     @property
     def lists(self):
-        res = ListSearchResult(Request('movie/{0}/lists'.format(self.id)))
-        res._name = "Lists containing {0}".format(self._printable_name())
+        res = ListSearchResult(Request('movie/{}/lists'.format(self.id)))
+        res._name = "Lists containing {}".format(self._printable_name())
         return res
 
     def _printable_name(self):
         if self.title is not None:
-            s = "'{0}'".format(self.title)
+            s = "'{}'".format(self.title)
         elif self.originaltitle is not None:
-            s = "'{0}'".format(self.originaltitle)
+            s = "'{}'".format(self.originaltitle)
         else:
             s = "'No Title'"
         if self.releasedate:
-            s = "{0} ({1})".format(s, self.releasedate.year)
+            s = "{} ({})".format(s, self.releasedate.year)
         return s
 
     def __repr__(self):
-        return "<{0} {1}>".format(self.__class__.__name__, self._printable_name())
+        return "<{} {}>".format(self.__class__.__name__, self._printable_name())
 
 
 class ReverseCast( Movie ):
@@ -780,14 +779,14 @@ class Collection(NameRepr, Element):
     overview = Datapoint('overview')
 
     def _populate(self):
-        return Request('collection/{0}'.format(self.id),
+        return Request('collection/{}'.format(self.id),
                        language=self._locale.language)
 
     def _populate_images(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['language'] = self._locale.language
-        return Request('collection/{0}/images'.format(self.id), **kwargs)
+        return Request('collection/{}/images'.format(self.id), **kwargs)
 
     backdrops = Datalist('backdrops', handler=Backdrop,
                          poller=_populate_images, sort=True)
@@ -806,7 +805,7 @@ class List(NameRepr, Element):
     members = Datalist('items', handler=Movie)
 
     def _populate(self):
-        return Request('list/{0}'.format(self.id))
+        return Request('list/{}'.format(self.id))
 
 class Network(NameRepr,Element):
     id = Datapoint('id', initarg=1)
@@ -831,10 +830,10 @@ class Episode_base(NameRepr, Element):
 
 class Episode(Episode_base):
     def _populate(self):
-        return Request('tv/{0}/season/{1}/episode/{2}'.format(self.series_id, self.season_number, self.episode_number),
+        return Request('tv/{}/season/{}/episode/{}'.format(self.series_id, self.season_number, self.episode_number),
                        language=self._locale.language)
     def _populate_cast(self):
-        return Request('tv/{0}/season/{1}/episode/{2}/credits'.format(
+        return Request('tv/{}/season/{}/episode/{}/credits'.format(
             self.series_id, self.season_number, self.episode_number),
                        language=self._locale.language)
     cast = Datalist('cast', handler=Cast,
@@ -843,14 +842,14 @@ def _populate_cast(self):
 
     # Items not currently used by tmdb3tv
     def _populate_external_ids(self):
-        return Request('tv/{0}/season/{1}/episode/{2}/external_ids'.format(
+        return Request('tv/{}/season/{}/episode/{}/external_ids'.format(
             self.series_id, self.season_number, self.episode_number))
 
     def _populate_images(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['language'] = self._locale.language
-        return Request('tv/{0}/season/{1}/episode/{2}/images'.format(
+        return Request('tv/{}/season/{}/episode/{}/images'.format(
             self.series_id, self.season_number, self.episode_number), **kwargs)
 
     imdb_id = Datapoint('imdb_id', poller=_populate_external_ids)
@@ -872,7 +871,7 @@ class Season(NameRepr, Element):
                         passthrough={'series_id': 'series_id', 'season_number': 'season_number'})
 
     def _populate(self):
-        return Request('tv/{0}/season/{1}'.format(self.series_id, self.season_number),
+        return Request('tv/{}/season/{}'.format(self.series_id, self.season_number),
                        language=self._locale.language)
 
     # Items not currently used by tmdb3tv
@@ -880,10 +879,10 @@ def _populate_images(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['language'] = self._locale.language
-        return Request('tv/{0}/season/{1}/images'.format(self.series_id, self.season_number), **kwargs)
+        return Request('tv/{}/season/{}/images'.format(self.series_id, self.season_number), **kwargs)
 
     def _populate_external_ids(self):
-        return Request('tv/{0}/season/{1}/external_ids'.format(self.series_id, self.season_number))
+        return Request('tv/{}/season/{}/external_ids'.format(self.series_id, self.season_number))
 
     posters = Datalist('posters', handler=Poster,
                        poller=_populate_images, sort=True)
@@ -925,21 +924,21 @@ class Series_base(NameRepr, Element):
 
 class Series(Series_base):
     def _populate(self):
-        return Request('tv/{0}'.format(self.id),
+        return Request('tv/{}'.format(self.id),
                        language=self._locale.language)
 
     # Items not currently used by tmdb3tv
     def _populate_cast(self):
-        return Request('tv/{0}/credits'.format(self.id))
+        return Request('tv/{}/credits'.format(self.id))
 
     def _populate_images(self):
         kwargs = {}
         if not self._locale.fallthrough:
             kwargs['language'] = self._locale.language
-        return Request('tv/{0}/images'.format(self.id), **kwargs)
+        return Request('tv/{}/images'.format(self.id), **kwargs)
 
     def _populate_external_ids(self):
-        return Request('tv/{0}/external_ids'.format(self.id))
+        return Request('tv/{}/external_ids'.format(self.id))
 
     cast = Datalist('cast', handler=Cast,
                     poller=_populate_cast, sort='order')
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py
index 659f3501da1..acc875b1081 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_auth.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: tmdb_auth.py
 # Python Library
@@ -85,7 +84,7 @@ def get_session(sessionid=None):
         return Session.new()
 
 
-class Session(object):
+class Session:
     @classmethod
     def new(cls):
         return cls(None)
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py
index 13620f119fd..d5dc5cf2642 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/tmdb_exceptions.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: tmdb_exceptions.py    Common exceptions used in tmdbv3 API library
 # Python Library
@@ -65,24 +64,24 @@ class TMDBCacheError(TMDBRequestError):
 
 class TMDBCacheReadError(TMDBCacheError):
     def __init__(self, filename):
-        super(TMDBCacheReadError, self).__init__(
-            "User does not have permission to access cache file: {0}."\
+        super().__init__(
+            "User does not have permission to access cache file: {}."\
                 .format(filename))
         self.filename = filename
 
 
 class TMDBCacheWriteError(TMDBCacheError):
     def __init__(self, filename):
-        super(TMDBCacheWriteError, self).__init__(
-            "User does not have permission to write cache file: {0}."\
+        super().__init__(
+            "User does not have permission to write cache file: {}."\
                 .format(filename))
         self.filename = filename
 
 
 class TMDBCacheDirectoryError(TMDBCacheError):
     def __init__(self, filename):
-        super(TMDBCacheDirectoryError, self).__init__(
-            "Directory containing cache file does not exist: {0}."\
+        super().__init__(
+            "Directory containing cache file does not exist: {}."\
                 .format(filename))
         self.filename = filename
 
@@ -96,7 +95,7 @@ def __init__(self, err):
         self.httperrno = err.code
         self.response = err.fp.read()
         self.headers = err.headers
-        super(TMDBHTTPError, self).__init__(str(err))
+        super().__init__(str(err))
 
 
 class TMDBOffline(TMDBError):
diff --git a/mythtv/bindings/python/tmdb3/tmdb3/util.py b/mythtv/bindings/python/tmdb3/tmdb3/util.py
index c149edc7720..738c0e5f6cf 100644
--- a/mythtv/bindings/python/tmdb3/tmdb3/util.py
+++ b/mythtv/bindings/python/tmdb3/tmdb3/util.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #-----------------------
 # Name: util.py    Assorted utilities used in tmdb_api
 # Python Library
@@ -11,23 +10,23 @@
 from .tmdb_auth import get_session
 
 
-class NameRepr(object):
+class NameRepr:
     """Mixin for __repr__ methods using 'name' attribute."""
     def __repr__(self):
         return ("<{0.__class__.__name__} '{0.name}'>".format(self))
 
 
-class SearchRepr(object):
+class SearchRepr:
     """
     Mixin for __repr__ methods for classes with '_name' and
     '_request' attributes.
     """
     def __repr__(self):
         name = self._name if self._name else self._request._kwargs['query']
-        return ("<Search Results: {0}>".format(name))
+        return ("<Search Results: {}>".format(name))
 
 
-class Poller(object):
+class Poller:
     """
     Wrapper for an optional callable to populate an Element derived
     class with raw data, or data from a Request.
@@ -103,7 +102,7 @@ def apply(self, data, set_nones=True):
         return unfilled
 
 
-class Data(object):
+class Data:
     """
     Basic response definition class
     This maps to a single key in a JSON dictionary received from the API
@@ -209,7 +208,7 @@ def __init__(self, field, handler=None, poller=None, sort=None, raw=True, passth
                        force the data to instead be passed in as the first
                        argument
         """
-        super(Datalist, self).__init__(field, None, handler, poller, raw, passthrough=passthrough)
+        super().__init__(field, None, handler, poller, raw, passthrough=passthrough)
         self.sort = sort
 
     def __set__(self, inst, value):
@@ -269,7 +268,7 @@ def __init__(self, field, handler=None, poller=None, raw=True,
         """
         if key and attr:
             raise TypeError("`key` and `attr` cannot both be defined")
-        super(Datadict, self).__init__(field, None, handler, poller, raw, passthrough=passthrough)
+        super().__init__(field, None, handler, poller, raw, passthrough=passthrough)
         if key:
             self.getkey = lambda x: x[key]
         elif attr:
@@ -329,7 +328,7 @@ def __new__(mcs, name, bases, attrs):
         # process all defined Data attribues, testing for use as an initial
         # argument, and building a list of what Pollers are used to populate
         # which Data points
-        pollermap = dict([(k, []) for k in pollers])
+        pollermap = {k: [] for k in pollers}
         initargs = []
         for k, v in list(data.items()):
             v.name = k
@@ -350,7 +349,7 @@ def __new__(mcs, name, bases, attrs):
         for k, v in list(pollermap.items()):
             if len(v) == 0:
                 continue
-            lookup = dict([(attr.field, attr.name) for attr in v])
+            lookup = {attr.field: attr.name for attr in v}
             poller = Poller(pollers[k], lookup)
             attrs[k] = poller
             # backfill wrapped Poller into each mapped Data object, and ensure
@@ -389,7 +388,7 @@ def __call__(cls, *args, **kwargs):
             # defined by the Data definitions
             if len(args) != len(cls._InitArgs):
                 raise TypeError(
-                        '__init__() takes exactly {0} arguments ({1} given)'\
+                        '__init__() takes exactly {} arguments ({} given)'\
                             .format(len(cls._InitArgs)+1, len(args)+1))
             for a, v in zip(cls._InitArgs, args):
                 setattr(obj, a, v)
@@ -398,5 +397,5 @@ def __call__(cls, *args, **kwargs):
         return obj
 
 
-class Element( object, metaclass=ElementType ):
+class Element(metaclass=ElementType ):
     _lang = 'en'
diff --git a/mythtv/bindings/python/ttvdbv4/definitions.py b/mythtv/bindings/python/ttvdbv4/definitions.py
index 80fbfe94dde..612895ed427 100644
--- a/mythtv/bindings/python/ttvdbv4/definitions.py
+++ b/mythtv/bindings/python/ttvdbv4/definitions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
@@ -43,14 +41,14 @@ def _handle_list(handle, data):
 # modifications marked with '### XXX'
 
 
-class Alias(object):
+class Alias:
     """An alias model, which can be associated with a series, season, movie, person, or list."""
     def __init__(self, data):
         self.language = data.get('language', '')                             # string
         self.name = data.get('name', '')                                     # string
 
 
-class ArtworkBaseRecord(object):
+class ArtworkBaseRecord:
     """base artwork record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -61,7 +59,7 @@ def __init__(self, data):
         self.type = data.get('type', 0)                                      # integer
 
 
-class ArtworkExtendedRecord(object):
+class ArtworkExtendedRecord:
     """extended artwork record"""
     def __init__(self, data):
         self.episodeId = data.get('episodeId', 0)                            # integer
@@ -86,14 +84,14 @@ def __init__(self, data):
         self.width = data.get('width', 0)                                    # integer
 
 
-class ArtworkStatus(object):
+class ArtworkStatus:
     """artwork status record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
         self.name = data.get('name', '')                                     # string
 
 
-class ArtworkType(object):
+class ArtworkType:
     """artwork type record"""
     def __init__(self, data):
         self.height = data.get('height', 0)                                  # integer
@@ -107,14 +105,14 @@ def __init__(self, data):
         self.width = data.get('width', 0)                                    # integer
 
 
-class AwardBaseRecord(object):
+class AwardBaseRecord:
     """base award record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
         self.name = data.get('name', '')                                     # string
 
 
-class AwardCategoryBaseRecord(object):
+class AwardCategoryBaseRecord:
     """base award category record"""
     def __init__(self, data):
         self.allowCoNominees = data.get('allowCoNominees', False)            # boolean
@@ -125,7 +123,7 @@ def __init__(self, data):
         self.name = data.get('name', '')                                     # string
 
 
-class AwardCategoryExtendedRecord(object):
+class AwardCategoryExtendedRecord:
     """extended award category record"""
     def __init__(self, data):
         self.allowCoNominees = data.get('allowCoNominees', False)            # boolean
@@ -137,7 +135,7 @@ def __init__(self, data):
         self.nominees = _handle_list(AwardNomineeBaseRecord, data.get('nominees'))
 
 
-class AwardExtendedRecord(object):
+class AwardExtendedRecord:
     """extended award record"""
     def __init__(self, data):
         self.categories = _handle_list(AwardCategoryBaseRecord, data.get('categories'))
@@ -146,7 +144,7 @@ def __init__(self, data):
         self.score = data.get('score', 0)                                    # integer
 
 
-class AwardNomineeBaseRecord(object):
+class AwardNomineeBaseRecord:
     """base award nominee record"""
     def __init__(self, data):
         self.character = _handle_single(Character, data.get('character'))
@@ -161,14 +159,14 @@ def __init__(self, data):
         self.name = data.get('name', '')                                     # string
 
 
-class Biography(object):
+class Biography:
     """biography record"""
     def __init__(self, data):
         self.biography = data.get('biography', '')                           # string
         self.language = data.get('language', '')                             # string
 
 
-class Character(object):
+class Character:
     """character record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -194,7 +192,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class Company(object):
+class Company:
     """A company record"""
     def __init__(self, data):
         self.activeDate = data.get('activeDate', '')                         # string
@@ -214,7 +212,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class ParentCompany(object):
+class ParentCompany:
     """A parent company record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -222,21 +220,21 @@ def __init__(self, data):
         self.relation = _handle_single(CompanyRelationShip, data.get('relation'))
 
 
-class CompanyRelationShip(object):
+class CompanyRelationShip:
     """A company relationship"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
         self.typeName = data.get('typeName', '')                             # string
 
 
-class CompanyType(object):
+class CompanyType:
     """A company type record"""
     def __init__(self, data):
         self.companyTypeId = data.get('companyTypeId', 0)                    # integer
         self.companyTypeName = data.get('companyTypeName', '')               # string
 
 
-class ContentRating(object):
+class ContentRating:
     """content rating record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -248,7 +246,7 @@ def __init__(self, data):
         self.fullName = data.get('fullName', '')                             # string
 
 
-class Country(object):
+class Country:
     """country record"""
     def __init__(self, data):
         self.id = data.get('id', '')                                         # string
@@ -256,7 +254,7 @@ def __init__(self, data):
         self.shortCode = data.get('shortCode', '')                           # string
 
 
-class Entity(object):
+class Entity:
     """Entity record"""
     def __init__(self, data):
         self.movieId = data.get('movieId', 0)                                # integer
@@ -264,7 +262,7 @@ def __init__(self, data):
         self.seriesId = data.get('seriesId', 0)                              # integer
 
 
-class EntityType(object):
+class EntityType:
     """Entity Type record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -272,7 +270,7 @@ def __init__(self, data):
         self.hasSpecials = data.get('hasSpecials', False)                    # boolean
 
 
-class EntityUpdate(object):
+class EntityUpdate:
     """entity update record"""
     def __init__(self, data):
         self.entityType = data.get('entityType', '')                         # string
@@ -282,7 +280,7 @@ def __init__(self, data):
         self.seriesId = data.get('seriesId', 0)                              # integer
 
 
-class EpisodeBaseRecord(object):
+class EpisodeBaseRecord:
     """base episode record"""
     def __init__(self, data):
         self.aired = data.get('aired', '')                                   # string
@@ -310,7 +308,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class EpisodeExtendedRecord(object):
+class EpisodeExtendedRecord:
     """extended episode record"""
     def __init__(self, data):
         self.aired = data.get('aired', '')                                   # string
@@ -348,14 +346,14 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class Gender(object):
+class Gender:
     """gender record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
         self.name = data.get('name', '')                                     # string
 
 
-class GenreBaseRecord(object):
+class GenreBaseRecord:
     """base genre record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -363,7 +361,7 @@ def __init__(self, data):
         self.slug = data.get('slug', '')                                     # string
 
 
-class Language(object):
+class Language:
     """language record"""
     def __init__(self, data):
         self.id = data.get('id', '')                                         # string
@@ -372,7 +370,7 @@ def __init__(self, data):
         self.shortCode = data.get('shortCode', '')                           # string
 
 
-class ListBaseRecord(object):
+class ListBaseRecord:
     """base list record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -391,7 +389,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class ListExtendedRecord(object):
+class ListExtendedRecord:
     """extended list record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -411,7 +409,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class MovieBaseRecord(object):
+class MovieBaseRecord:
     """base movie record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -430,7 +428,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class MovieExtendedRecord(object):
+class MovieExtendedRecord:
     """extended movie record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -471,7 +469,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class PeopleBaseRecord(object):
+class PeopleBaseRecord:
     """base people record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -486,7 +484,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class PeopleExtendedRecord(object):
+class PeopleExtendedRecord:
     """extended people record"""
     def __init__(self, data):
         self.aliases = _handle_list(Alias, data.get('aliases'))
@@ -512,20 +510,20 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class PeopleType(object):
+class PeopleType:
     """people type record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
         self.name = data.get('name', '')                                     # string
 
 
-class Race(object):
+class Race:
     """race record"""
     def __init__(self, data):
         pass
 
 
-class Release(object):
+class Release:
     """release record"""
     def __init__(self, data):
         self.country = data.get('country', '')                               # string
@@ -533,7 +531,7 @@ def __init__(self, data):
         self.detail = data.get('detail', '')                                 # string
 
 
-class RemoteID(object):
+class RemoteID:
     """remote id record"""
     def __init__(self, data):
         self.id = data.get('id', '')                                         # string
@@ -541,7 +539,7 @@ def __init__(self, data):
         self.sourceName = data.get('sourceName', '')                         # string
 
 
-class SearchResult(object):
+class SearchResult:
     """search result"""
     def __init__(self, data):
         self.aliases = _get_list(data, 'aliases')
@@ -582,7 +580,7 @@ def __init__(self, data):
         self.name_similarity = 0.0                                           ### XXX
 
 
-class SeasonBaseRecord(object):
+class SeasonBaseRecord:
     """season genre record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -600,7 +598,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class SeasonExtendedRecord(object):
+class SeasonExtendedRecord:
     """extended season record"""
     def __init__(self, data):
         self.artwork = _handle_list(ArtworkBaseRecord, data.get('artwork'))
@@ -623,7 +621,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class SeasonType(object):
+class SeasonType:
     """season type record"""
     def __init__(self, data):
         self.alternateName = data.get('alternateName', '')                   # string
@@ -632,7 +630,7 @@ def __init__(self, data):
         self.type = data.get('type', '')                                     # string
 
 
-class SeriesAirsDays(object):
+class SeriesAirsDays:
     """A series airs day record"""
     def __init__(self, data):
         self.friday = data.get('friday', False)                              # boolean
@@ -644,7 +642,7 @@ def __init__(self, data):
         self.wednesday = data.get('wednesday', False)                        # boolean
 
 
-class SeriesBaseRecord(object):
+class SeriesBaseRecord:
     """
     The base record for a series. All series airs time like firstAired, lastAired, nextAired, etc.
     are in US EST for US series, and for all non-US series, the time of the show’s
@@ -678,7 +676,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class SeriesExtendedRecord(object):
+class SeriesExtendedRecord:
     """
     The extended record for a series. All series airs time like firstAired, lastAired, nextAired, etc.
     are in US EST for US series, and for all non-US series, the time of the show’s country capital
@@ -728,7 +726,7 @@ def __init__(self, data):
         self.name_similarity = 0.0
 
 
-class SourceType(object):
+class SourceType:
     """source type record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -739,7 +737,7 @@ def __init__(self, data):
         self.sort = data.get('sort', 0)                                      # integer
 
 
-class Status(object):
+class Status:
     """status record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -748,7 +746,7 @@ def __init__(self, data):
         self.recordType = data.get('recordType', '')                         # string
 
 
-class StudioBaseRecord(object):
+class StudioBaseRecord:
     """studio record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -756,7 +754,7 @@ def __init__(self, data):
         self.parentStudio = data.get('parentStudio', 0)                      # integer
 
 
-class Tag(object):
+class Tag:
     """tag record"""
     def __init__(self, data):
         self.allowsMultiple = data.get('allowsMultiple', False)              # boolean
@@ -766,7 +764,7 @@ def __init__(self, data):
         self.options = _handle_list(TagOption, data.get('options'))
 
 
-class TagOption(object):
+class TagOption:
     """tag option record"""
     def __init__(self, data):
         self.helpText = data.get('helpText', '')                             # string
@@ -776,7 +774,7 @@ def __init__(self, data):
         self.tagName = data.get('tagName', '')                               # string
 
 
-class Trailer(object):
+class Trailer:
     """trailer record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -785,7 +783,7 @@ def __init__(self, data):
         self.url = data.get('url', '')                                       # string
 
 
-class Translation(object):
+class Translation:
     """translation record"""
     def __init__(self, data):
         self.aliases = _get_list(data, 'aliases')
@@ -797,13 +795,13 @@ def __init__(self, data):
         self.tagline = data.get('tagline', '')                               # string
 
 
-class TranslationSimple(object):
+class TranslationSimple:
     """translation simple record"""
     def __init__(self, data):
         self.language = data.get('language', '')                             # string
 
 
-class TranslationExtended(object):
+class TranslationExtended:
     """translation extended record"""
     def __init__(self, data):
         self.nameTranslations = _handle_list(Translation, data.get('nameTranslations'))
@@ -811,7 +809,7 @@ def __init__(self, data):
         self.alias = _get_list(data, 'alias')
 
 
-class TagOptionEntity(object):
+class TagOptionEntity:
     """a entity with selected tag option"""
     def __init__(self, data):
         self.name = data.get('name', '')                                     # string
@@ -819,7 +817,7 @@ def __init__(self, data):
         self.tagId = data.get('tagId', 0)                                    # integer
 
 
-class Inspiration(object):
+class Inspiration:
     """Movie inspiration record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -828,7 +826,7 @@ def __init__(self, data):
         self.url = data.get('url', '')                                       # string
 
 
-class InspirationType(object):
+class InspirationType:
     """Movie inspiration type record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -838,7 +836,7 @@ def __init__(self, data):
         self.url = data.get('url', '')                                       # string
 
 
-class ProductionCountry(object):
+class ProductionCountry:
     """Production country record"""
     def __init__(self, data):
         self.id = data.get('id', 0)                                          # integer
@@ -846,7 +844,7 @@ def __init__(self, data):
         self.name = data.get('name', '')                                     # string
 
 
-class Companies(object):
+class Companies:
     """Companies by type record"""
     def __init__(self, data):
         self.studio = _handle_single(Company, data.get('studio'))
@@ -856,7 +854,7 @@ def __init__(self, data):
         self.special_effects = _handle_single(Company, data.get('special_effects'))
 
 
-class Links(object):
+class Links:
     """Links for next, previous and current record"""
     def __init__(self, data):
         self.prev = data.get('prev', '')                                     # string
diff --git a/mythtv/bindings/python/ttvdbv4/get_api_v4.py b/mythtv/bindings/python/ttvdbv4/get_api_v4.py
index 2aefd3fb3d5..c1ac40bf7f6 100644
--- a/mythtv/bindings/python/ttvdbv4/get_api_v4.py
+++ b/mythtv/bindings/python/ttvdbv4/get_api_v4.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
diff --git a/mythtv/bindings/python/ttvdbv4/locales.py b/mythtv/bindings/python/ttvdbv4/locales.py
index 1e51f37c67c..cd64b4b5c33 100644
--- a/mythtv/bindings/python/ttvdbv4/locales.py
+++ b/mythtv/bindings/python/ttvdbv4/locales.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 #-----------------------
 # Name: locales.py    Stores locale information for filtering results
 # Python Library
@@ -15,7 +13,7 @@
 import locale
 
 
-class LocaleBase(object):
+class LocaleBase:
     __slots__ = ['__immutable']
     _stored = {}
     fallthrough = False
@@ -29,13 +27,13 @@ def __setattr__(self, key, value):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__setattr__(key, value)
+        super().__setattr__(key, value)
 
     def __delattr__(self, key):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__delattr__(key)
+        super().__delattr__(key)
 
     @classmethod
     def getstored(cls, key):
@@ -44,7 +42,7 @@ def getstored(cls, key):
         try:
             return cls._stored[key.lower()]
         except:
-            raise Exception("'{0}' is not a known valid {1} code."\
+            raise Exception("'{}' is not a known valid {} code."\
                                   .format(key, cls.__name__))
 
 
@@ -59,13 +57,13 @@ def __init__(self, iso1, iso2b, iso2t, ename):
         self.ISO639_2T = iso2t
         self.englishname = ename
 #        self.nativename = nname
-        super(Language, self).__init__(iso1, iso2b, iso2t, ename)
+        super().__init__(iso1, iso2b, iso2t, ename)
 
     def __str__(self):
         return self.ISO639_1
 
     def __repr__(self):
-        return u"<Language '{0.englishname}' ({0.ISO639_1}) ({0.ISO639_2T}) ({0.ISO639_2B})>".format(self)
+        return "<Language '{0.englishname}' ({0.ISO639_1}) ({0.ISO639_2T}) ({0.ISO639_2B})>".format(self)
 
 
 class Country(LocaleBase):
@@ -76,488 +74,488 @@ def __init__(self, alpha2, alpha3, name):
         self.alpha2 = alpha2
         self.alpha3 = alpha3
         self.name = name
-        super(Country, self).__init__(alpha2, alpha3, name)
+        super().__init__(alpha2, alpha3, name)
 
     def __str__(self):
         return self.alpha2
 
     def __repr__(self):
-        return u"<Country '{0.name}' ({0.alpha2}) ({0.alpha3})>".format(self)
+        return "<Country '{0.name}' ({0.alpha2}) ({0.alpha3})>".format(self)
 
 
 #    ISO-639-1, ISO-639-2/B, ISO-639-2/T, English Name
-Language("ab", "abk", "abk", u"Abkhazian")
-Language("aa", "aar", "aar", u"Afar")
-Language("af", "afr", "afr", u"Afrikaans")
-Language("ak", "aka", "aka", u"Akan")
-Language("sq", "alb", "sqi", u"Albanian")
-Language("am", "amh", "amh", u"Amharic")
-Language("ar", "ara", "ara", u"Arabic")
-Language("an", "arg", "arg", u"Aragonese")
-Language("hy", "arm", "hye", u"Armenian")
-Language("as", "asm", "asm", u"Assamese")
-Language("av", "ava", "ava", u"Avaric")
-Language("ae", "ave", "ave", u"Avestan")
-Language("ay", "aym", "aym", u"Aymara")
-Language("az", "aze", "aze", u"Azerbaijani")
-Language("bm", "bam", "bam", u"Bambara")
-Language("ba", "bak", "bak", u"Bashkir")
-Language("eu", "baq", "eus", u"Basque")
-Language("be", "bel", "bel", u"Belarusian")
-Language("bn", "ben", "ben", u"Bengali")
-Language("bh", "bih", "bih", u"Bihari languages")
-Language("bi", "bis", "bis", u"Bislama")
-Language("nb", "nob", "nob", u"Bokmål, Norwegian")
-Language("bs", "bos", "bos", u"Bosnian")
-Language("br", "bre", "bre", u"Breton")
-Language("bg", "bul", "bul", u"Bulgarian")
-Language("my", "bur", "mya", u"Burmese")
-Language("es", "spa", "spa", u"Castilian")
-Language("ca", "cat", "cat", u"Catalan")
-Language("km", "khm", "khm", u"Central Khmer")
-Language("ch", "cha", "cha", u"Chamorro")
-Language("ce", "che", "che", u"Chechen")
-Language("ny", "nya", "nya", u"Chewa")
-Language("ny", "nya", "nya", u"Chichewa")
-Language("zh", "chi", "zho", u"Chinese")
-Language("za", "zha", "zha", u"Chuang")
-Language("cu", "chu", "chu", u"Church Slavic")
-Language("cu", "chu", "chu", u"Church Slavonic")
-Language("cv", "chv", "chv", u"Chuvash")
-Language("kw", "cor", "cor", u"Cornish")
-Language("co", "cos", "cos", u"Corsican")
-Language("cr", "cre", "cre", u"Cree")
-Language("hr", "hrv", "hrv", u"Croatian")
-Language("cs", "cze", "ces", u"Czech")
-Language("da", "dan", "dan", u"Danish")
-Language("dv", "div", "div", u"Dhivehi")
-Language("dv", "div", "div", u"Divehi")
-Language("nl", "dut", "nld", u"Dutch")
-Language("dz", "dzo", "dzo", u"Dzongkha")
-Language("en", "eng", "eng", u"English")
-Language("eo", "epo", "epo", u"Esperanto")
-Language("et", "est", "est", u"Estonian")
-Language("ee", "ewe", "ewe", u"Ewe")
-Language("fo", "fao", "fao", u"Faroese")
-Language("fj", "fij", "fij", u"Fijian")
-Language("fi", "fin", "fin", u"Finnish")
-Language("nl", "dut", "nld", u"Flemish")
-Language("fr", "fre", "fra", u"French")
-Language("ff", "ful", "ful", u"Fulah")
-Language("gd", "gla", "gla", u"Gaelic")
-Language("gl", "glg", "glg", u"Galician")
-Language("lg", "lug", "lug", u"Ganda")
-Language("ka", "geo", "kat", u"Georgian")
-Language("de", "ger", "deu", u"German")
-Language("ki", "kik", "kik", u"Gikuyu")
-Language("el", "gre", "ell", u"Greek, Modern (1453-)")
-Language("kl", "kal", "kal", u"Greenlandic")
-Language("gn", "grn", "grn", u"Guarani")
-Language("gu", "guj", "guj", u"Gujarati")
-Language("ht", "hat", "hat", u"Haitian")
-Language("ht", "hat", "hat", u"Haitian Creole")
-Language("ha", "hau", "hau", u"Hausa")
-Language("he", "heb", "heb", u"Hebrew")
-Language("hz", "her", "her", u"Herero")
-Language("hi", "hin", "hin", u"Hindi")
-Language("ho", "hmo", "hmo", u"Hiri Motu")
-Language("hu", "hun", "hun", u"Hungarian")
-Language("is", "ice", "isl", u"Icelandic")
-Language("io", "ido", "ido", u"Ido")
-Language("ig", "ibo", "ibo", u"Igbo")
-Language("id", "ind", "ind", u"Indonesian")
-Language("ia", "ina", "ina", u"Interlingua (International Auxiliary Language Association)")
-Language("ie", "ile", "ile", u"Interlingue")
-Language("iu", "iku", "iku", u"Inuktitut")
-Language("ik", "ipk", "ipk", u"Inupiaq")
-Language("ga", "gle", "gle", u"Irish")
-Language("it", "ita", "ita", u"Italian")
-Language("ja", "jpn", "jpn", u"Japanese")
-Language("jv", "jav", "jav", u"Javanese")
-Language("kl", "kal", "kal", u"Kalaallisut")
-Language("kn", "kan", "kan", u"Kannada")
-Language("kr", "kau", "kau", u"Kanuri")
-Language("ks", "kas", "kas", u"Kashmiri")
-Language("kk", "kaz", "kaz", u"Kazakh")
-Language("ki", "kik", "kik", u"Kikuyu")
-Language("rw", "kin", "kin", u"Kinyarwanda")
-Language("ky", "kir", "kir", u"Kirghiz")
-Language("kv", "kom", "kom", u"Komi")
-Language("kg", "kon", "kon", u"Kongo")
-Language("ko", "kor", "kor", u"Korean")
-Language("kj", "kua", "kua", u"Kuanyama")
-Language("ku", "kur", "kur", u"Kurdish")
-Language("kj", "kua", "kua", u"Kwanyama")
-Language("ky", "kir", "kir", u"Kyrgyz")
-Language("lo", "lao", "lao", u"Lao")
-Language("la", "lat", "lat", u"Latin")
-Language("lv", "lav", "lav", u"Latvian")
-Language("lb", "ltz", "ltz", u"Letzeburgesch")
-Language("li", "lim", "lim", u"Limburgan")
-Language("li", "lim", "lim", u"Limburger")
-Language("li", "lim", "lim", u"Limburgish")
-Language("ln", "lin", "lin", u"Lingala")
-Language("lt", "lit", "lit", u"Lithuanian")
-Language("lu", "lub", "lub", u"Luba-Katanga")
-Language("lb", "ltz", "ltz", u"Luxembourgish")
-Language("mk", "mac", "mkd", u"Macedonian")
-Language("mg", "mlg", "mlg", u"Malagasy")
-Language("ms", "may", "msa", u"Malay")
-Language("ml", "mal", "mal", u"Malayalam")
-Language("dv", "div", "div", u"Maldivian")
-Language("mt", "mlt", "mlt", u"Maltese")
-Language("gv", "glv", "glv", u"Manx")
-Language("mi", "mao", "mri", u"Maori")
-Language("mr", "mar", "mar", u"Marathi")
-Language("mh", "mah", "mah", u"Marshallese")
-Language("ro", "rum", "ron", u"Moldavian")
-Language("ro", "rum", "ron", u"Moldovan")
-Language("mn", "mon", "mon", u"Mongolian")
-Language("na", "nau", "nau", u"Nauru")
-Language("nv", "nav", "nav", u"Navaho")
-Language("nv", "nav", "nav", u"Navajo")
-Language("nd", "nde", "nde", u"Ndebele, North")
-Language("nr", "nbl", "nbl", u"Ndebele, South")
-Language("ng", "ndo", "ndo", u"Ndonga")
-Language("ne", "nep", "nep", u"Nepali")
-Language("nd", "nde", "nde", u"North Ndebele")
-Language("se", "sme", "sme", u"Northern Sami")
-Language("no", "nor", "nor", u"Norwegian")
-Language("nb", "nob", "nob", u"Norwegian Bokmål")
-Language("nn", "nno", "nno", u"Norwegian Nynorsk")
-Language("ii", "iii", "iii", u"Nuosu")
-Language("ny", "nya", "nya", u"Nyanja")
-Language("nn", "nno", "nno", u"Nynorsk, Norwegian")
-Language("ie", "ile", "ile", u"Occidental")
-Language("oc", "oci", "oci", u"Occitan (post 1500)")
-Language("oj", "oji", "oji", u"Ojibwa")
-Language("cu", "chu", "chu", u"Old Bulgarian")
-Language("cu", "chu", "chu", u"Old Church Slavonic")
-Language("cu", "chu", "chu", u"Old Slavonic")
-Language("or", "ori", "ori", u"Oriya")
-Language("om", "orm", "orm", u"Oromo")
-Language("os", "oss", "oss", u"Ossetian")
-Language("os", "oss", "oss", u"Ossetic")
-Language("pi", "pli", "pli", u"Pali")
-Language("pa", "pan", "pan", u"Panjabi")
-Language("ps", "pus", "pus", u"Pashto")
-Language("fa", "per", "fas", u"Persian")
-Language("pl", "pol", "pol", u"Polish")
-Language("pt", "por", "por", u"Portuguese")
-Language("pa", "pan", "pan", u"Punjabi")
-Language("ps", "pus", "pus", u"Pushto")
-Language("qu", "que", "que", u"Quechua")
-Language("ro", "rum", "ron", u"Romanian")
-Language("rm", "roh", "roh", u"Romansh")
-Language("rn", "run", "run", u"Rundi")
-Language("ru", "rus", "rus", u"Russian")
-Language("sm", "smo", "smo", u"Samoan")
-Language("sg", "sag", "sag", u"Sango")
-Language("sa", "san", "san", u"Sanskrit")
-Language("sc", "srd", "srd", u"Sardinian")
-Language("gd", "gla", "gla", u"Scottish Gaelic")
-Language("sr", "srp", "srp", u"Serbian")
-Language("sn", "sna", "sna", u"Shona")
-Language("ii", "iii", "iii", u"Sichuan Yi")
-Language("sd", "snd", "snd", u"Sindhi")
-Language("si", "sin", "sin", u"Sinhala")
-Language("si", "sin", "sin", u"Sinhalese")
-Language("sk", "slo", "slk", u"Slovak")
-Language("sl", "slv", "slv", u"Slovenian")
-Language("so", "som", "som", u"Somali")
-Language("st", "sot", "sot", u"Sotho, Southern")
-Language("nr", "nbl", "nbl", u"South Ndebele")
-Language("es", "spa", "spa", u"Spanish")
-Language("su", "sun", "sun", u"Sundanese")
-Language("sw", "swa", "swa", u"Swahili")
-Language("ss", "ssw", "ssw", u"Swati")
-Language("sv", "swe", "swe", u"Swedish")
-Language("tl", "tgl", "tgl", u"Tagalog")
-Language("ty", "tah", "tah", u"Tahitian")
-Language("tg", "tgk", "tgk", u"Tajik")
-Language("ta", "tam", "tam", u"Tamil")
-Language("tt", "tat", "tat", u"Tatar")
-Language("te", "tel", "tel", u"Telugu")
-Language("th", "tha", "tha", u"Thai")
-Language("bo", "tib", "bod", u"Tibetan")
-Language("ti", "tir", "tir", u"Tigrinya")
-Language("to", "ton", "ton", u"Tonga (Tonga Islands)")
-Language("ts", "tso", "tso", u"Tsonga")
-Language("tn", "tsn", "tsn", u"Tswana")
-Language("tr", "tur", "tur", u"Turkish")
-Language("tk", "tuk", "tuk", u"Turkmen")
-Language("tw", "twi", "twi", u"Twi")
-Language("ug", "uig", "uig", u"Uighur")
-Language("uk", "ukr", "ukr", u"Ukrainian")
-Language("ur", "urd", "urd", u"Urdu")
-Language("ug", "uig", "uig", u"Uyghur")
-Language("uz", "uzb", "uzb", u"Uzbek")
-Language("ca", "cat", "cat", u"Valencian")
-Language("ve", "ven", "ven", u"Venda")
-Language("vi", "vie", "vie", u"Vietnamese")
-Language("vo", "vol", "vol", u"Volapük")
-Language("wa", "wln", "wln", u"Walloon")
-Language("cy", "wel", "cym", u"Welsh")
-Language("fy", "fry", "fry", u"Western Frisian")
-Language("wo", "wol", "wol", u"Wolof")
-Language("xh", "xho", "xho", u"Xhosa")
-Language("yi", "yid", "yid", u"Yiddish")
-Language("yo", "yor", "yor", u"Yoruba")
-Language("za", "zha", "zha", u"Zhuang")
-Language("zu", "zul", "zul", u"Zulu")
+Language("ab", "abk", "abk", "Abkhazian")
+Language("aa", "aar", "aar", "Afar")
+Language("af", "afr", "afr", "Afrikaans")
+Language("ak", "aka", "aka", "Akan")
+Language("sq", "alb", "sqi", "Albanian")
+Language("am", "amh", "amh", "Amharic")
+Language("ar", "ara", "ara", "Arabic")
+Language("an", "arg", "arg", "Aragonese")
+Language("hy", "arm", "hye", "Armenian")
+Language("as", "asm", "asm", "Assamese")
+Language("av", "ava", "ava", "Avaric")
+Language("ae", "ave", "ave", "Avestan")
+Language("ay", "aym", "aym", "Aymara")
+Language("az", "aze", "aze", "Azerbaijani")
+Language("bm", "bam", "bam", "Bambara")
+Language("ba", "bak", "bak", "Bashkir")
+Language("eu", "baq", "eus", "Basque")
+Language("be", "bel", "bel", "Belarusian")
+Language("bn", "ben", "ben", "Bengali")
+Language("bh", "bih", "bih", "Bihari languages")
+Language("bi", "bis", "bis", "Bislama")
+Language("nb", "nob", "nob", "Bokmål, Norwegian")
+Language("bs", "bos", "bos", "Bosnian")
+Language("br", "bre", "bre", "Breton")
+Language("bg", "bul", "bul", "Bulgarian")
+Language("my", "bur", "mya", "Burmese")
+Language("es", "spa", "spa", "Castilian")
+Language("ca", "cat", "cat", "Catalan")
+Language("km", "khm", "khm", "Central Khmer")
+Language("ch", "cha", "cha", "Chamorro")
+Language("ce", "che", "che", "Chechen")
+Language("ny", "nya", "nya", "Chewa")
+Language("ny", "nya", "nya", "Chichewa")
+Language("zh", "chi", "zho", "Chinese")
+Language("za", "zha", "zha", "Chuang")
+Language("cu", "chu", "chu", "Church Slavic")
+Language("cu", "chu", "chu", "Church Slavonic")
+Language("cv", "chv", "chv", "Chuvash")
+Language("kw", "cor", "cor", "Cornish")
+Language("co", "cos", "cos", "Corsican")
+Language("cr", "cre", "cre", "Cree")
+Language("hr", "hrv", "hrv", "Croatian")
+Language("cs", "cze", "ces", "Czech")
+Language("da", "dan", "dan", "Danish")
+Language("dv", "div", "div", "Dhivehi")
+Language("dv", "div", "div", "Divehi")
+Language("nl", "dut", "nld", "Dutch")
+Language("dz", "dzo", "dzo", "Dzongkha")
+Language("en", "eng", "eng", "English")
+Language("eo", "epo", "epo", "Esperanto")
+Language("et", "est", "est", "Estonian")
+Language("ee", "ewe", "ewe", "Ewe")
+Language("fo", "fao", "fao", "Faroese")
+Language("fj", "fij", "fij", "Fijian")
+Language("fi", "fin", "fin", "Finnish")
+Language("nl", "dut", "nld", "Flemish")
+Language("fr", "fre", "fra", "French")
+Language("ff", "ful", "ful", "Fulah")
+Language("gd", "gla", "gla", "Gaelic")
+Language("gl", "glg", "glg", "Galician")
+Language("lg", "lug", "lug", "Ganda")
+Language("ka", "geo", "kat", "Georgian")
+Language("de", "ger", "deu", "German")
+Language("ki", "kik", "kik", "Gikuyu")
+Language("el", "gre", "ell", "Greek, Modern (1453-)")
+Language("kl", "kal", "kal", "Greenlandic")
+Language("gn", "grn", "grn", "Guarani")
+Language("gu", "guj", "guj", "Gujarati")
+Language("ht", "hat", "hat", "Haitian")
+Language("ht", "hat", "hat", "Haitian Creole")
+Language("ha", "hau", "hau", "Hausa")
+Language("he", "heb", "heb", "Hebrew")
+Language("hz", "her", "her", "Herero")
+Language("hi", "hin", "hin", "Hindi")
+Language("ho", "hmo", "hmo", "Hiri Motu")
+Language("hu", "hun", "hun", "Hungarian")
+Language("is", "ice", "isl", "Icelandic")
+Language("io", "ido", "ido", "Ido")
+Language("ig", "ibo", "ibo", "Igbo")
+Language("id", "ind", "ind", "Indonesian")
+Language("ia", "ina", "ina", "Interlingua (International Auxiliary Language Association)")
+Language("ie", "ile", "ile", "Interlingue")
+Language("iu", "iku", "iku", "Inuktitut")
+Language("ik", "ipk", "ipk", "Inupiaq")
+Language("ga", "gle", "gle", "Irish")
+Language("it", "ita", "ita", "Italian")
+Language("ja", "jpn", "jpn", "Japanese")
+Language("jv", "jav", "jav", "Javanese")
+Language("kl", "kal", "kal", "Kalaallisut")
+Language("kn", "kan", "kan", "Kannada")
+Language("kr", "kau", "kau", "Kanuri")
+Language("ks", "kas", "kas", "Kashmiri")
+Language("kk", "kaz", "kaz", "Kazakh")
+Language("ki", "kik", "kik", "Kikuyu")
+Language("rw", "kin", "kin", "Kinyarwanda")
+Language("ky", "kir", "kir", "Kirghiz")
+Language("kv", "kom", "kom", "Komi")
+Language("kg", "kon", "kon", "Kongo")
+Language("ko", "kor", "kor", "Korean")
+Language("kj", "kua", "kua", "Kuanyama")
+Language("ku", "kur", "kur", "Kurdish")
+Language("kj", "kua", "kua", "Kwanyama")
+Language("ky", "kir", "kir", "Kyrgyz")
+Language("lo", "lao", "lao", "Lao")
+Language("la", "lat", "lat", "Latin")
+Language("lv", "lav", "lav", "Latvian")
+Language("lb", "ltz", "ltz", "Letzeburgesch")
+Language("li", "lim", "lim", "Limburgan")
+Language("li", "lim", "lim", "Limburger")
+Language("li", "lim", "lim", "Limburgish")
+Language("ln", "lin", "lin", "Lingala")
+Language("lt", "lit", "lit", "Lithuanian")
+Language("lu", "lub", "lub", "Luba-Katanga")
+Language("lb", "ltz", "ltz", "Luxembourgish")
+Language("mk", "mac", "mkd", "Macedonian")
+Language("mg", "mlg", "mlg", "Malagasy")
+Language("ms", "may", "msa", "Malay")
+Language("ml", "mal", "mal", "Malayalam")
+Language("dv", "div", "div", "Maldivian")
+Language("mt", "mlt", "mlt", "Maltese")
+Language("gv", "glv", "glv", "Manx")
+Language("mi", "mao", "mri", "Maori")
+Language("mr", "mar", "mar", "Marathi")
+Language("mh", "mah", "mah", "Marshallese")
+Language("ro", "rum", "ron", "Moldavian")
+Language("ro", "rum", "ron", "Moldovan")
+Language("mn", "mon", "mon", "Mongolian")
+Language("na", "nau", "nau", "Nauru")
+Language("nv", "nav", "nav", "Navaho")
+Language("nv", "nav", "nav", "Navajo")
+Language("nd", "nde", "nde", "Ndebele, North")
+Language("nr", "nbl", "nbl", "Ndebele, South")
+Language("ng", "ndo", "ndo", "Ndonga")
+Language("ne", "nep", "nep", "Nepali")
+Language("nd", "nde", "nde", "North Ndebele")
+Language("se", "sme", "sme", "Northern Sami")
+Language("no", "nor", "nor", "Norwegian")
+Language("nb", "nob", "nob", "Norwegian Bokmål")
+Language("nn", "nno", "nno", "Norwegian Nynorsk")
+Language("ii", "iii", "iii", "Nuosu")
+Language("ny", "nya", "nya", "Nyanja")
+Language("nn", "nno", "nno", "Nynorsk, Norwegian")
+Language("ie", "ile", "ile", "Occidental")
+Language("oc", "oci", "oci", "Occitan (post 1500)")
+Language("oj", "oji", "oji", "Ojibwa")
+Language("cu", "chu", "chu", "Old Bulgarian")
+Language("cu", "chu", "chu", "Old Church Slavonic")
+Language("cu", "chu", "chu", "Old Slavonic")
+Language("or", "ori", "ori", "Oriya")
+Language("om", "orm", "orm", "Oromo")
+Language("os", "oss", "oss", "Ossetian")
+Language("os", "oss", "oss", "Ossetic")
+Language("pi", "pli", "pli", "Pali")
+Language("pa", "pan", "pan", "Panjabi")
+Language("ps", "pus", "pus", "Pashto")
+Language("fa", "per", "fas", "Persian")
+Language("pl", "pol", "pol", "Polish")
+Language("pt", "por", "por", "Portuguese")
+Language("pa", "pan", "pan", "Punjabi")
+Language("ps", "pus", "pus", "Pushto")
+Language("qu", "que", "que", "Quechua")
+Language("ro", "rum", "ron", "Romanian")
+Language("rm", "roh", "roh", "Romansh")
+Language("rn", "run", "run", "Rundi")
+Language("ru", "rus", "rus", "Russian")
+Language("sm", "smo", "smo", "Samoan")
+Language("sg", "sag", "sag", "Sango")
+Language("sa", "san", "san", "Sanskrit")
+Language("sc", "srd", "srd", "Sardinian")
+Language("gd", "gla", "gla", "Scottish Gaelic")
+Language("sr", "srp", "srp", "Serbian")
+Language("sn", "sna", "sna", "Shona")
+Language("ii", "iii", "iii", "Sichuan Yi")
+Language("sd", "snd", "snd", "Sindhi")
+Language("si", "sin", "sin", "Sinhala")
+Language("si", "sin", "sin", "Sinhalese")
+Language("sk", "slo", "slk", "Slovak")
+Language("sl", "slv", "slv", "Slovenian")
+Language("so", "som", "som", "Somali")
+Language("st", "sot", "sot", "Sotho, Southern")
+Language("nr", "nbl", "nbl", "South Ndebele")
+Language("es", "spa", "spa", "Spanish")
+Language("su", "sun", "sun", "Sundanese")
+Language("sw", "swa", "swa", "Swahili")
+Language("ss", "ssw", "ssw", "Swati")
+Language("sv", "swe", "swe", "Swedish")
+Language("tl", "tgl", "tgl", "Tagalog")
+Language("ty", "tah", "tah", "Tahitian")
+Language("tg", "tgk", "tgk", "Tajik")
+Language("ta", "tam", "tam", "Tamil")
+Language("tt", "tat", "tat", "Tatar")
+Language("te", "tel", "tel", "Telugu")
+Language("th", "tha", "tha", "Thai")
+Language("bo", "tib", "bod", "Tibetan")
+Language("ti", "tir", "tir", "Tigrinya")
+Language("to", "ton", "ton", "Tonga (Tonga Islands)")
+Language("ts", "tso", "tso", "Tsonga")
+Language("tn", "tsn", "tsn", "Tswana")
+Language("tr", "tur", "tur", "Turkish")
+Language("tk", "tuk", "tuk", "Turkmen")
+Language("tw", "twi", "twi", "Twi")
+Language("ug", "uig", "uig", "Uighur")
+Language("uk", "ukr", "ukr", "Ukrainian")
+Language("ur", "urd", "urd", "Urdu")
+Language("ug", "uig", "uig", "Uyghur")
+Language("uz", "uzb", "uzb", "Uzbek")
+Language("ca", "cat", "cat", "Valencian")
+Language("ve", "ven", "ven", "Venda")
+Language("vi", "vie", "vie", "Vietnamese")
+Language("vo", "vol", "vol", "Volapük")
+Language("wa", "wln", "wln", "Walloon")
+Language("cy", "wel", "cym", "Welsh")
+Language("fy", "fry", "fry", "Western Frisian")
+Language("wo", "wol", "wol", "Wolof")
+Language("xh", "xho", "xho", "Xhosa")
+Language("yi", "yid", "yid", "Yiddish")
+Language("yo", "yor", "yor", "Yoruba")
+Language("za", "zha", "zha", "Zhuang")
+Language("zu", "zul", "zul", "Zulu")
 
 
 
 # ISO-3166 alpha-2, alpha-3, English Name
-Country("AF", "AFG", u"Afghanistan")
-Country("AL", "ALB", u"Albania")
-Country("DZ", "DZA", u"Algeria")
-Country("AS", "ASM", u"American Samoa")
-Country("AD", "AND", u"Andorra")
-Country("AO", "AGO", u"Angola")
-Country("AI", "AIA", u"Anguilla")
-Country("AQ", "ATA", u"Antarctica")
-Country("AG", "ATG", u"Antigua and Barbuda")
-Country("AR", "ARG", u"Argentina")
-Country("AM", "ARM", u"Armenia")
-Country("AW", "ABW", u"Aruba")
-Country("AU", "AUS", u"Australia")
-Country("AT", "AUT", u"Austria")
-Country("AZ", "AZE", u"Azerbaijan")
-Country("BS", "BHS", u"Bahamas (the)")
-Country("BH", "BHR", u"Bahrain")
-Country("BD", "BGD", u"Bangladesh")
-Country("BB", "BRB", u"Barbados")
-Country("BY", "BLR", u"Belarus")
-Country("BE", "BEL", u"Belgium")
-Country("BZ", "BLZ", u"Belize")
-Country("BJ", "BEN", u"Benin")
-Country("BM", "BMU", u"Bermuda")
-Country("BT", "BTN", u"Bhutan")
-Country("BO", "BOL", u"Bolivia (Plurinational State of)")
-Country("BQ", "BES", u"Bonaire, Sint Eustatius and Saba")
-Country("BA", "BIH", u"Bosnia and Herzegovina")
-Country("BW", "BWA", u"Botswana")
-Country("BV", "BVT", u"Bouvet Island")
-Country("BR", "BRA", u"Brazil")
-Country("IO", "IOT", u"British Indian Ocean Territory (the)")
-Country("BN", "BRN", u"Brunei Darussalam")
-Country("BG", "BGR", u"Bulgaria")
-Country("BF", "BFA", u"Burkina Faso")
-Country("BI", "BDI", u"Burundi")
-Country("CV", "CPV", u"Cabo Verde")
-Country("KH", "KHM", u"Cambodia")
-Country("CM", "CMR", u"Cameroon")
-Country("CA", "CAN", u"Canada")
-Country("KY", "CYM", u"Cayman Islands (the)")
-Country("CF", "CAF", u"Central African Republic (the)")
-Country("TD", "TCD", u"Chad")
-Country("CL", "CHL", u"Chile")
-Country("CN", "CHN", u"China")
-Country("CX", "CXR", u"Christmas Island")
-Country("CC", "CCK", u"Cocos (Keeling) Islands (the)")
-Country("CO", "COL", u"Colombia")
-Country("KM", "COM", u"Comoros (the)")
-Country("CD", "COD", u"Congo (the Democratic Republic of the)")
-Country("CG", "COG", u"Congo (the)")
-Country("CK", "COK", u"Cook Islands (the)")
-Country("CR", "CRI", u"Costa Rica")
-Country("HR", "HRV", u"Croatia")
-Country("CU", "CUB", u"Cuba")
-Country("CW", "CUW", u"Curaçao")
-Country("CY", "CYP", u"Cyprus")
-Country("CZ", "CZE", u"Czechia")
-Country("CI", "CIV", u"Côte d'Ivoire")
-Country("DK", "DNK", u"Denmark")
-Country("DJ", "DJI", u"Djibouti")
-Country("DM", "DMA", u"Dominica")
-Country("DO", "DOM", u"Dominican Republic (the)")
-Country("EC", "ECU", u"Ecuador")
-Country("EG", "EGY", u"Egypt")
-Country("SV", "SLV", u"El Salvador")
-Country("GQ", "GNQ", u"Equatorial Guinea")
-Country("ER", "ERI", u"Eritrea")
-Country("EE", "EST", u"Estonia")
-Country("SZ", "SWZ", u"Eswatini")
-Country("ET", "ETH", u"Ethiopia")
-Country("FK", "FLK", u"Falkland Islands (the) [Malvinas]")
-Country("FO", "FRO", u"Faroe Islands (the)")
-Country("FJ", "FJI", u"Fiji")
-Country("FI", "FIN", u"Finland")
-Country("FR", "FRA", u"France")
-Country("GF", "GUF", u"French Guiana")
-Country("PF", "PYF", u"French Polynesia")
-Country("TF", "ATF", u"French Southern Territories (the)")
-Country("GA", "GAB", u"Gabon")
-Country("GM", "GMB", u"Gambia (the)")
-Country("GE", "GEO", u"Georgia")
-Country("DE", "DEU", u"Germany")
-Country("GH", "GHA", u"Ghana")
-Country("GI", "GIB", u"Gibraltar")
-Country("GR", "GRC", u"Greece")
-Country("GL", "GRL", u"Greenland")
-Country("GD", "GRD", u"Grenada")
-Country("GP", "GLP", u"Guadeloupe")
-Country("GU", "GUM", u"Guam")
-Country("GT", "GTM", u"Guatemala")
-Country("GG", "GGY", u"Guernsey")
-Country("GN", "GIN", u"Guinea")
-Country("GW", "GNB", u"Guinea-Bissau")
-Country("GY", "GUY", u"Guyana")
-Country("HT", "HTI", u"Haiti")
-Country("HM", "HMD", u"Heard Island and McDonald Islands")
-Country("VA", "VAT", u"Holy See (the)")
-Country("HN", "HND", u"Honduras")
-Country("HK", "HKG", u"Hong Kong")
-Country("HU", "HUN", u"Hungary")
-Country("IS", "ISL", u"Iceland")
-Country("IN", "IND", u"India")
-Country("ID", "IDN", u"Indonesia")
-Country("IR", "IRN", u"Iran (Islamic Republic of)")
-Country("IQ", "IRQ", u"Iraq")
-Country("IE", "IRL", u"Ireland")
-Country("IM", "IMN", u"Isle of Man")
-Country("IL", "ISR", u"Israel")
-Country("IT", "ITA", u"Italy")
-Country("JM", "JAM", u"Jamaica")
-Country("JP", "JPN", u"Japan")
-Country("JE", "JEY", u"Jersey")
-Country("JO", "JOR", u"Jordan")
-Country("KZ", "KAZ", u"Kazakhstan")
-Country("KE", "KEN", u"Kenya")
-Country("KI", "KIR", u"Kiribati")
-Country("KP", "PRK", u"Korea (the Democratic People's Republic of)")
-Country("KR", "KOR", u"Korea (the Republic of)")
-Country("KW", "KWT", u"Kuwait")
-Country("KG", "KGZ", u"Kyrgyzstan")
-Country("LA", "LAO", u"Lao People's Democratic Republic (the)")
-Country("LV", "LVA", u"Latvia")
-Country("LB", "LBN", u"Lebanon")
-Country("LS", "LSO", u"Lesotho")
-Country("LR", "LBR", u"Liberia")
-Country("LY", "LBY", u"Libya")
-Country("LI", "LIE", u"Liechtenstein")
-Country("LT", "LTU", u"Lithuania")
-Country("LU", "LUX", u"Luxembourg")
-Country("MO", "MAC", u"Macao")
-Country("MG", "MDG", u"Madagascar")
-Country("MW", "MWI", u"Malawi")
-Country("MY", "MYS", u"Malaysia")
-Country("MV", "MDV", u"Maldives")
-Country("ML", "MLI", u"Mali")
-Country("MT", "MLT", u"Malta")
-Country("MH", "MHL", u"Marshall Islands (the)")
-Country("MQ", "MTQ", u"Martinique")
-Country("MR", "MRT", u"Mauritania")
-Country("MU", "MUS", u"Mauritius")
-Country("YT", "MYT", u"Mayotte")
-Country("MX", "MEX", u"Mexico")
-Country("FM", "FSM", u"Micronesia (Federated States of)")
-Country("MD", "MDA", u"Moldova (the Republic of)")
-Country("MC", "MCO", u"Monaco")
-Country("MN", "MNG", u"Mongolia")
-Country("ME", "MNE", u"Montenegro")
-Country("MS", "MSR", u"Montserrat")
-Country("MA", "MAR", u"Morocco")
-Country("MZ", "MOZ", u"Mozambique")
-Country("MM", "MMR", u"Myanmar")
-Country("NA", "NAM", u"Namibia")
-Country("NR", "NRU", u"Nauru")
-Country("NP", "NPL", u"Nepal")
-Country("NL", "NLD", u"Netherlands (the)")
-Country("NC", "NCL", u"New Caledonia")
-Country("NZ", "NZL", u"New Zealand")
-Country("NI", "NIC", u"Nicaragua")
-Country("NE", "NER", u"Niger (the)")
-Country("NG", "NGA", u"Nigeria")
-Country("NU", "NIU", u"Niue")
-Country("NF", "NFK", u"Norfolk Island")
-Country("MP", "MNP", u"Northern Mariana Islands (the)")
-Country("NO", "NOR", u"Norway")
-Country("OM", "OMN", u"Oman")
-Country("PK", "PAK", u"Pakistan")
-Country("PW", "PLW", u"Palau")
-Country("PS", "PSE", u"Palestine, State of")
-Country("PA", "PAN", u"Panama")
-Country("PG", "PNG", u"Papua New Guinea")
-Country("PY", "PRY", u"Paraguay")
-Country("PE", "PER", u"Peru")
-Country("PH", "PHL", u"Philippines (the)")
-Country("PN", "PCN", u"Pitcairn")
-Country("PL", "POL", u"Poland")
-Country("PT", "PRT", u"Portugal")
-Country("PR", "PRI", u"Puerto Rico")
-Country("QA", "QAT", u"Qatar")
-Country("MK", "MKD", u"Republic of North Macedonia")
-Country("RO", "ROU", u"Romania")
-Country("RU", "RUS", u"Russian Federation (the)")
-Country("RW", "RWA", u"Rwanda")
-Country("RE", "REU", u"Réunion")
-Country("BL", "BLM", u"Saint Barthélemy")
-Country("SH", "SHN", u"Saint Helena, Ascension and Tristan da Cunha")
-Country("KN", "KNA", u"Saint Kitts and Nevis")
-Country("LC", "LCA", u"Saint Lucia")
-Country("MF", "MAF", u"Saint Martin (French part)")
-Country("PM", "SPM", u"Saint Pierre and Miquelon")
-Country("VC", "VCT", u"Saint Vincent and the Grenadines")
-Country("WS", "WSM", u"Samoa")
-Country("SM", "SMR", u"San Marino")
-Country("ST", "STP", u"Sao Tome and Principe")
-Country("SA", "SAU", u"Saudi Arabia")
-Country("SN", "SEN", u"Senegal")
-Country("RS", "SRB", u"Serbia")
-Country("SC", "SYC", u"Seychelles")
-Country("SL", "SLE", u"Sierra Leone")
-Country("SG", "SGP", u"Singapore")
-Country("SX", "SXM", u"Sint Maarten (Dutch part)")
-Country("SK", "SVK", u"Slovakia")
-Country("SI", "SVN", u"Slovenia")
-Country("SB", "SLB", u"Solomon Islands")
-Country("SO", "SOM", u"Somalia")
-Country("ZA", "ZAF", u"South Africa")
-Country("GS", "SGS", u"South Georgia and the South Sandwich Islands")
-Country("SS", "SSD", u"South Sudan")
-Country("ES", "ESP", u"Spain")
-Country("LK", "LKA", u"Sri Lanka")
-Country("SD", "SDN", u"Sudan (the)")
-Country("SR", "SUR", u"Suriname")
-Country("SJ", "SJM", u"Svalbard and Jan Mayen")
-Country("SE", "SWE", u"Sweden")
-Country("CH", "CHE", u"Switzerland")
-Country("SY", "SYR", u"Syrian Arab Republic")
-Country("TW", "TWN", u"Taiwan (Province of China)")
-Country("TJ", "TJK", u"Tajikistan")
-Country("TZ", "TZA", u"Tanzania, United Republic of")
-Country("TH", "THA", u"Thailand")
-Country("TL", "TLS", u"Timor-Leste")
-Country("TG", "TGO", u"Togo")
-Country("TK", "TKL", u"Tokelau")
-Country("TO", "TON", u"Tonga")
-Country("TT", "TTO", u"Trinidad and Tobago")
-Country("TN", "TUN", u"Tunisia")
-Country("TR", "TUR", u"Turkey")
-Country("TM", "TKM", u"Turkmenistan")
-Country("TC", "TCA", u"Turks and Caicos Islands (the)")
-Country("TV", "TUV", u"Tuvalu")
-Country("UG", "UGA", u"Uganda")
-Country("UA", "UKR", u"Ukraine")
-Country("AE", "ARE", u"United Arab Emirates (the)")
-Country("GB", "GBR", u"United Kingdom of Great Britain and Northern Ireland (the)")
-Country("UM", "UMI", u"United States Minor Outlying Islands (the)")
-Country("US", "USA", u"United States of America (the)")
-Country("UY", "URY", u"Uruguay")
-Country("UZ", "UZB", u"Uzbekistan")
-Country("VU", "VUT", u"Vanuatu")
-Country("VE", "VEN", u"Venezuela (Bolivarian Republic of)")
-Country("VN", "VNM", u"Viet Nam")
-Country("VG", "VGB", u"Virgin Islands (British)")
-Country("VI", "VIR", u"Virgin Islands (U.S.)")
-Country("WF", "WLF", u"Wallis and Futuna")
-Country("EH", "ESH", u"Western Sahara")
-Country("YE", "YEM", u"Yemen")
-Country("ZM", "ZMB", u"Zambia")
-Country("ZW", "ZWE", u"Zimbabwe")
-Country("AX", "ALA", u"Åland Islands")
+Country("AF", "AFG", "Afghanistan")
+Country("AL", "ALB", "Albania")
+Country("DZ", "DZA", "Algeria")
+Country("AS", "ASM", "American Samoa")
+Country("AD", "AND", "Andorra")
+Country("AO", "AGO", "Angola")
+Country("AI", "AIA", "Anguilla")
+Country("AQ", "ATA", "Antarctica")
+Country("AG", "ATG", "Antigua and Barbuda")
+Country("AR", "ARG", "Argentina")
+Country("AM", "ARM", "Armenia")
+Country("AW", "ABW", "Aruba")
+Country("AU", "AUS", "Australia")
+Country("AT", "AUT", "Austria")
+Country("AZ", "AZE", "Azerbaijan")
+Country("BS", "BHS", "Bahamas (the)")
+Country("BH", "BHR", "Bahrain")
+Country("BD", "BGD", "Bangladesh")
+Country("BB", "BRB", "Barbados")
+Country("BY", "BLR", "Belarus")
+Country("BE", "BEL", "Belgium")
+Country("BZ", "BLZ", "Belize")
+Country("BJ", "BEN", "Benin")
+Country("BM", "BMU", "Bermuda")
+Country("BT", "BTN", "Bhutan")
+Country("BO", "BOL", "Bolivia (Plurinational State of)")
+Country("BQ", "BES", "Bonaire, Sint Eustatius and Saba")
+Country("BA", "BIH", "Bosnia and Herzegovina")
+Country("BW", "BWA", "Botswana")
+Country("BV", "BVT", "Bouvet Island")
+Country("BR", "BRA", "Brazil")
+Country("IO", "IOT", "British Indian Ocean Territory (the)")
+Country("BN", "BRN", "Brunei Darussalam")
+Country("BG", "BGR", "Bulgaria")
+Country("BF", "BFA", "Burkina Faso")
+Country("BI", "BDI", "Burundi")
+Country("CV", "CPV", "Cabo Verde")
+Country("KH", "KHM", "Cambodia")
+Country("CM", "CMR", "Cameroon")
+Country("CA", "CAN", "Canada")
+Country("KY", "CYM", "Cayman Islands (the)")
+Country("CF", "CAF", "Central African Republic (the)")
+Country("TD", "TCD", "Chad")
+Country("CL", "CHL", "Chile")
+Country("CN", "CHN", "China")
+Country("CX", "CXR", "Christmas Island")
+Country("CC", "CCK", "Cocos (Keeling) Islands (the)")
+Country("CO", "COL", "Colombia")
+Country("KM", "COM", "Comoros (the)")
+Country("CD", "COD", "Congo (the Democratic Republic of the)")
+Country("CG", "COG", "Congo (the)")
+Country("CK", "COK", "Cook Islands (the)")
+Country("CR", "CRI", "Costa Rica")
+Country("HR", "HRV", "Croatia")
+Country("CU", "CUB", "Cuba")
+Country("CW", "CUW", "Curaçao")
+Country("CY", "CYP", "Cyprus")
+Country("CZ", "CZE", "Czechia")
+Country("CI", "CIV", "Côte d'Ivoire")
+Country("DK", "DNK", "Denmark")
+Country("DJ", "DJI", "Djibouti")
+Country("DM", "DMA", "Dominica")
+Country("DO", "DOM", "Dominican Republic (the)")
+Country("EC", "ECU", "Ecuador")
+Country("EG", "EGY", "Egypt")
+Country("SV", "SLV", "El Salvador")
+Country("GQ", "GNQ", "Equatorial Guinea")
+Country("ER", "ERI", "Eritrea")
+Country("EE", "EST", "Estonia")
+Country("SZ", "SWZ", "Eswatini")
+Country("ET", "ETH", "Ethiopia")
+Country("FK", "FLK", "Falkland Islands (the) [Malvinas]")
+Country("FO", "FRO", "Faroe Islands (the)")
+Country("FJ", "FJI", "Fiji")
+Country("FI", "FIN", "Finland")
+Country("FR", "FRA", "France")
+Country("GF", "GUF", "French Guiana")
+Country("PF", "PYF", "French Polynesia")
+Country("TF", "ATF", "French Southern Territories (the)")
+Country("GA", "GAB", "Gabon")
+Country("GM", "GMB", "Gambia (the)")
+Country("GE", "GEO", "Georgia")
+Country("DE", "DEU", "Germany")
+Country("GH", "GHA", "Ghana")
+Country("GI", "GIB", "Gibraltar")
+Country("GR", "GRC", "Greece")
+Country("GL", "GRL", "Greenland")
+Country("GD", "GRD", "Grenada")
+Country("GP", "GLP", "Guadeloupe")
+Country("GU", "GUM", "Guam")
+Country("GT", "GTM", "Guatemala")
+Country("GG", "GGY", "Guernsey")
+Country("GN", "GIN", "Guinea")
+Country("GW", "GNB", "Guinea-Bissau")
+Country("GY", "GUY", "Guyana")
+Country("HT", "HTI", "Haiti")
+Country("HM", "HMD", "Heard Island and McDonald Islands")
+Country("VA", "VAT", "Holy See (the)")
+Country("HN", "HND", "Honduras")
+Country("HK", "HKG", "Hong Kong")
+Country("HU", "HUN", "Hungary")
+Country("IS", "ISL", "Iceland")
+Country("IN", "IND", "India")
+Country("ID", "IDN", "Indonesia")
+Country("IR", "IRN", "Iran (Islamic Republic of)")
+Country("IQ", "IRQ", "Iraq")
+Country("IE", "IRL", "Ireland")
+Country("IM", "IMN", "Isle of Man")
+Country("IL", "ISR", "Israel")
+Country("IT", "ITA", "Italy")
+Country("JM", "JAM", "Jamaica")
+Country("JP", "JPN", "Japan")
+Country("JE", "JEY", "Jersey")
+Country("JO", "JOR", "Jordan")
+Country("KZ", "KAZ", "Kazakhstan")
+Country("KE", "KEN", "Kenya")
+Country("KI", "KIR", "Kiribati")
+Country("KP", "PRK", "Korea (the Democratic People's Republic of)")
+Country("KR", "KOR", "Korea (the Republic of)")
+Country("KW", "KWT", "Kuwait")
+Country("KG", "KGZ", "Kyrgyzstan")
+Country("LA", "LAO", "Lao People's Democratic Republic (the)")
+Country("LV", "LVA", "Latvia")
+Country("LB", "LBN", "Lebanon")
+Country("LS", "LSO", "Lesotho")
+Country("LR", "LBR", "Liberia")
+Country("LY", "LBY", "Libya")
+Country("LI", "LIE", "Liechtenstein")
+Country("LT", "LTU", "Lithuania")
+Country("LU", "LUX", "Luxembourg")
+Country("MO", "MAC", "Macao")
+Country("MG", "MDG", "Madagascar")
+Country("MW", "MWI", "Malawi")
+Country("MY", "MYS", "Malaysia")
+Country("MV", "MDV", "Maldives")
+Country("ML", "MLI", "Mali")
+Country("MT", "MLT", "Malta")
+Country("MH", "MHL", "Marshall Islands (the)")
+Country("MQ", "MTQ", "Martinique")
+Country("MR", "MRT", "Mauritania")
+Country("MU", "MUS", "Mauritius")
+Country("YT", "MYT", "Mayotte")
+Country("MX", "MEX", "Mexico")
+Country("FM", "FSM", "Micronesia (Federated States of)")
+Country("MD", "MDA", "Moldova (the Republic of)")
+Country("MC", "MCO", "Monaco")
+Country("MN", "MNG", "Mongolia")
+Country("ME", "MNE", "Montenegro")
+Country("MS", "MSR", "Montserrat")
+Country("MA", "MAR", "Morocco")
+Country("MZ", "MOZ", "Mozambique")
+Country("MM", "MMR", "Myanmar")
+Country("NA", "NAM", "Namibia")
+Country("NR", "NRU", "Nauru")
+Country("NP", "NPL", "Nepal")
+Country("NL", "NLD", "Netherlands (the)")
+Country("NC", "NCL", "New Caledonia")
+Country("NZ", "NZL", "New Zealand")
+Country("NI", "NIC", "Nicaragua")
+Country("NE", "NER", "Niger (the)")
+Country("NG", "NGA", "Nigeria")
+Country("NU", "NIU", "Niue")
+Country("NF", "NFK", "Norfolk Island")
+Country("MP", "MNP", "Northern Mariana Islands (the)")
+Country("NO", "NOR", "Norway")
+Country("OM", "OMN", "Oman")
+Country("PK", "PAK", "Pakistan")
+Country("PW", "PLW", "Palau")
+Country("PS", "PSE", "Palestine, State of")
+Country("PA", "PAN", "Panama")
+Country("PG", "PNG", "Papua New Guinea")
+Country("PY", "PRY", "Paraguay")
+Country("PE", "PER", "Peru")
+Country("PH", "PHL", "Philippines (the)")
+Country("PN", "PCN", "Pitcairn")
+Country("PL", "POL", "Poland")
+Country("PT", "PRT", "Portugal")
+Country("PR", "PRI", "Puerto Rico")
+Country("QA", "QAT", "Qatar")
+Country("MK", "MKD", "Republic of North Macedonia")
+Country("RO", "ROU", "Romania")
+Country("RU", "RUS", "Russian Federation (the)")
+Country("RW", "RWA", "Rwanda")
+Country("RE", "REU", "Réunion")
+Country("BL", "BLM", "Saint Barthélemy")
+Country("SH", "SHN", "Saint Helena, Ascension and Tristan da Cunha")
+Country("KN", "KNA", "Saint Kitts and Nevis")
+Country("LC", "LCA", "Saint Lucia")
+Country("MF", "MAF", "Saint Martin (French part)")
+Country("PM", "SPM", "Saint Pierre and Miquelon")
+Country("VC", "VCT", "Saint Vincent and the Grenadines")
+Country("WS", "WSM", "Samoa")
+Country("SM", "SMR", "San Marino")
+Country("ST", "STP", "Sao Tome and Principe")
+Country("SA", "SAU", "Saudi Arabia")
+Country("SN", "SEN", "Senegal")
+Country("RS", "SRB", "Serbia")
+Country("SC", "SYC", "Seychelles")
+Country("SL", "SLE", "Sierra Leone")
+Country("SG", "SGP", "Singapore")
+Country("SX", "SXM", "Sint Maarten (Dutch part)")
+Country("SK", "SVK", "Slovakia")
+Country("SI", "SVN", "Slovenia")
+Country("SB", "SLB", "Solomon Islands")
+Country("SO", "SOM", "Somalia")
+Country("ZA", "ZAF", "South Africa")
+Country("GS", "SGS", "South Georgia and the South Sandwich Islands")
+Country("SS", "SSD", "South Sudan")
+Country("ES", "ESP", "Spain")
+Country("LK", "LKA", "Sri Lanka")
+Country("SD", "SDN", "Sudan (the)")
+Country("SR", "SUR", "Suriname")
+Country("SJ", "SJM", "Svalbard and Jan Mayen")
+Country("SE", "SWE", "Sweden")
+Country("CH", "CHE", "Switzerland")
+Country("SY", "SYR", "Syrian Arab Republic")
+Country("TW", "TWN", "Taiwan (Province of China)")
+Country("TJ", "TJK", "Tajikistan")
+Country("TZ", "TZA", "Tanzania, United Republic of")
+Country("TH", "THA", "Thailand")
+Country("TL", "TLS", "Timor-Leste")
+Country("TG", "TGO", "Togo")
+Country("TK", "TKL", "Tokelau")
+Country("TO", "TON", "Tonga")
+Country("TT", "TTO", "Trinidad and Tobago")
+Country("TN", "TUN", "Tunisia")
+Country("TR", "TUR", "Turkey")
+Country("TM", "TKM", "Turkmenistan")
+Country("TC", "TCA", "Turks and Caicos Islands (the)")
+Country("TV", "TUV", "Tuvalu")
+Country("UG", "UGA", "Uganda")
+Country("UA", "UKR", "Ukraine")
+Country("AE", "ARE", "United Arab Emirates (the)")
+Country("GB", "GBR", "United Kingdom of Great Britain and Northern Ireland (the)")
+Country("UM", "UMI", "United States Minor Outlying Islands (the)")
+Country("US", "USA", "United States of America (the)")
+Country("UY", "URY", "Uruguay")
+Country("UZ", "UZB", "Uzbekistan")
+Country("VU", "VUT", "Vanuatu")
+Country("VE", "VEN", "Venezuela (Bolivarian Republic of)")
+Country("VN", "VNM", "Viet Nam")
+Country("VG", "VGB", "Virgin Islands (British)")
+Country("VI", "VIR", "Virgin Islands (U.S.)")
+Country("WF", "WLF", "Wallis and Futuna")
+Country("EH", "ESH", "Western Sahara")
+Country("YE", "YEM", "Yemen")
+Country("ZM", "ZMB", "Zambia")
+Country("ZW", "ZWE", "Zimbabwe")
+Country("AX", "ALA", "Åland Islands")
 
 
 
@@ -578,9 +576,9 @@ def __repr__(self):
     print(repr(Country.getstored('ax')))
     print(Country.getstored('AX').name)
     print(Country.getstored('ALA').alpha2)
-    print(Country.getstored(u"Åland Islands").alpha3)
+    print(Country.getstored("Åland Islands").alpha3)
 
     print(repr(Country.getstored('MC')))
     print(Country.getstored('MC').name)
     print(Country.getstored('mco').alpha2)
-    print(Country.getstored(u"Monaco").alpha3)
+    print(Country.getstored("Monaco").alpha3)
diff --git a/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py b/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py
index 2f677bf31cf..c574eb2f605 100644
--- a/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py
+++ b/mythtv/bindings/python/ttvdbv4/myth4ttvdbv4.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
@@ -123,7 +121,7 @@ class People(IntEnum):
     Executive_Producer = 11
 
 
-class Myth4TTVDBv4(object):
+class Myth4TTVDBv4:
     """
     MythTV Bindings for TheTVDB v4.
     This class implements the following grabber options by means of :
@@ -297,7 +295,7 @@ def __init__(self, **kwargs):
         ttvdb.set_session(self.session)
 
         # prepare the resulting xml tree
-        self.tree = etree.XML(u'<metadata></metadata>')
+        self.tree = etree.XML('<metadata></metadata>')
 
     def _get_ellapsed_time(self):
         return (int(time.time() - self.starttime))
diff --git a/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py b/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py
index 3a64f78eaca..204a95c0a30 100644
--- a/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py
+++ b/mythtv/bindings/python/ttvdbv4/ttvdbv4_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
@@ -43,7 +41,7 @@ def _query_api(url, params=None):
         # python requests encodes everything with 'quote_plus"
         # thetvdb api may need '%20' instead of '+' for a space character
         if params:
-            url = '{0}?{1}'.format(url, urlencode(params, safe='', quote_via=quote))
+            url = '{}?{}'.format(url, urlencode(params, safe='', quote_via=quote))
         res = ReqSession.get(url)
     else:
         res = ReqSession.get(url, params=params)
diff --git a/mythtv/bindings/python/ttvdbv4/utils.py b/mythtv/bindings/python/ttvdbv4/utils.py
index 1713e885f10..c334f00cb09 100644
--- a/mythtv/bindings/python/ttvdbv4/utils.py
+++ b/mythtv/bindings/python/ttvdbv4/utils.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
 # Copyright: (c) 2021 Roland Ernst
diff --git a/mythtv/bindings/python/tvmaze/artwork.py b/mythtv/bindings/python/tvmaze/artwork.py
index 9dd0567ea76..574caee3607 100644
--- a/mythtv/bindings/python/tvmaze/artwork.py
+++ b/mythtv/bindings/python/tvmaze/artwork.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2021 Steve Erlenborn
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,7 +19,7 @@
 #  SOFTWARE.
 
 
-class Artwork(object):
+class Artwork:
     def __init__(self, data):
         self.id = data.get('id')        # ID for the artwork
         self.type = data.get('type')    # 'poster', 'background', or 'banner'
diff --git a/mythtv/bindings/python/tvmaze/embed.py b/mythtv/bindings/python/tvmaze/embed.py
index 64bb4b560a3..a0e3683a391 100644
--- a/mythtv/bindings/python/tvmaze/embed.py
+++ b/mythtv/bindings/python/tvmaze/embed.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,7 +27,7 @@
 # ---------------------------------------------------
 
 
-class Embed(object):
+class Embed:
     def __init__(self, data):
         self.key = 'embed'
         self.value = None
diff --git a/mythtv/bindings/python/tvmaze/endpoints.py b/mythtv/bindings/python/tvmaze/endpoints.py
index c281848f625..148e1612055 100644
--- a/mythtv/bindings/python/tvmaze/endpoints.py
+++ b/mythtv/bindings/python/tvmaze/endpoints.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/mythtv/bindings/python/tvmaze/episode.py b/mythtv/bindings/python/tvmaze/episode.py
index 0db9aca3695..4f167f8bd7c 100644
--- a/mythtv/bindings/python/tvmaze/episode.py
+++ b/mythtv/bindings/python/tvmaze/episode.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,7 +30,7 @@
 from . import utils
 
 
-class Episode(object):
+class Episode:
     def __init__(self, data):
         self.id = data.get('id')
         self.url = data.get('url')
diff --git a/mythtv/bindings/python/tvmaze/locales.py b/mythtv/bindings/python/tvmaze/locales.py
index 1e150085a99..126f2d4625f 100644
--- a/mythtv/bindings/python/tvmaze/locales.py
+++ b/mythtv/bindings/python/tvmaze/locales.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 #-----------------------
 # Name: locales.py    Stores locale information for filtering results
 # Python Library
@@ -14,7 +12,7 @@
 # ----------------------
 
 
-class LocaleBase(object):
+class LocaleBase:
     __slots__ = ['__immutable']
     _stored = {}
     fallthrough = False
@@ -28,13 +26,13 @@ def __setattr__(self, key, value):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__setattr__(key, value)
+        super().__setattr__(key, value)
 
     def __delattr__(self, key):
         if getattr(self, '__immutable', False):
             raise NotImplementedError(self.__class__.__name__ +
                                       ' does not support modification.')
-        super(LocaleBase, self).__delattr__(key)
+        super().__delattr__(key)
 
     def __lt__(self, other):
         return (id(self) != id(other)) and (str(self) > str(other))
@@ -52,7 +50,7 @@ def getstored(cls, key):
         try:
             return cls._stored[key.lower()]
         except:
-            raise Exception("LocaleBase: '{0}' is not a known valid {1} code."
+            raise Exception("LocaleBase: '{}' is not a known valid {} code."
                             .format(key, cls.__name__))
 
 
@@ -67,13 +65,13 @@ def __init__(self, iso1, iso2, ename):
 #        self.ISO639_2B = iso2b
         self.englishname = ename
 #        self.nativename = nname
-        super(Language, self).__init__(iso1, iso2, ename)
+        super().__init__(iso1, iso2, ename)
 
     def __str__(self):
         return self.ISO639_1
 
     def __repr__(self):
-        return u"<Language '{0.englishname}' ({0.ISO639_1})>".format(self)
+        return "<Language '{0.englishname}' ({0.ISO639_1})>".format(self)
 
 
 class Country(LocaleBase):
@@ -83,13 +81,13 @@ class Country(LocaleBase):
     def __init__(self, alpha2, name):
         self.alpha2 = alpha2
         self.name = name
-        super(Country, self).__init__(alpha2)
+        super().__init__(alpha2)
 
     def __str__(self):
         return self.alpha2
 
     def __repr__(self):
-        return u"<Country '{0.name}' ({0.alpha2})>".format(self)
+        return "<Country '{0.name}' ({0.alpha2})>".format(self)
 
 
 
diff --git a/mythtv/bindings/python/tvmaze/person.py b/mythtv/bindings/python/tvmaze/person.py
index 8bb17b4db70..362cc797a1d 100644
--- a/mythtv/bindings/python/tvmaze/person.py
+++ b/mythtv/bindings/python/tvmaze/person.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -32,7 +30,7 @@
 from . import utils
 
 
-class Person(object):
+class Person:
     def __init__(self, data):
         self.id = data.get('id')
         self.url = data.get('url')
@@ -48,7 +46,7 @@ def __str__(self):
         return self.name
 
 
-class Character(object):
+class Character:
     def __init__(self, data, person):
         self.id = data.get('id')
         self.url = data.get('url')
@@ -66,7 +64,7 @@ def __str__(self):
 
 class Crew(Person):
     def __init__(self, data):
-        super(Crew, self).__init__(data.get('person'))
+        super().__init__(data.get('person'))
         self.job = data.get('type')
 
     def __str__(self):
diff --git a/mythtv/bindings/python/tvmaze/season.py b/mythtv/bindings/python/tvmaze/season.py
index 026ee446419..45b84234280 100644
--- a/mythtv/bindings/python/tvmaze/season.py
+++ b/mythtv/bindings/python/tvmaze/season.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -33,7 +31,7 @@
 from . import utils
 
 
-class Season(object):
+class Season:
     def __init__(self, data, special=False):
             self.id = data.get('id')
             self.url = data.get('url')
diff --git a/mythtv/bindings/python/tvmaze/show.py b/mythtv/bindings/python/tvmaze/show.py
index 9e07af70432..08ebf06a3dc 100644
--- a/mythtv/bindings/python/tvmaze/show.py
+++ b/mythtv/bindings/python/tvmaze/show.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36,7 +34,7 @@
 from .person import Crew, Character
 
 
-class Show(object):
+class Show:
     def __init__(self, data):
         self.score = data.get('score') if 'score' in data else 100
         show = data.get('show') if 'show' in data else data
diff --git a/mythtv/bindings/python/tvmaze/tvmaze_api.py b/mythtv/bindings/python/tvmaze/tvmaze_api.py
index b02bfdea896..f0838ecb0db 100644
--- a/mythtv/bindings/python/tvmaze/tvmaze_api.py
+++ b/mythtv/bindings/python/tvmaze/tvmaze_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 #  Copyright (c) 2020 Lachlan Mackenzie
 #
 #  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -123,7 +121,7 @@ def _simple_iso_date_parser(date):
                 return isodate
             except:
                 pass
-    raise TypeError("time data '{0}' does not match ISO 8601 format" \
+    raise TypeError("time data '{}' does not match ISO 8601 format" \
                                 .format(date))
 
 
diff --git a/mythtv/bindings/python/tvmaze/utils.py b/mythtv/bindings/python/tvmaze/utils.py
index e1d358953e1..df8b4f4902e 100644
--- a/mythtv/bindings/python/tvmaze/utils.py
+++ b/mythtv/bindings/python/tvmaze/utils.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 from datetime import datetime
 import sys
 
diff --git a/mythtv/configure b/mythtv/configure
index 7fb9ff640e2..28441cceceb 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -5535,7 +5535,7 @@ if enabled bdjava; then
         java_code_version=1.4
 
         javac_version=`"${JAVAC}" -version 2>&1 | head -n 1`
-        
+
         echo "${javac_version}" | grep -E -q '^javac (9|1[0-1])' && java_code_version=1.6
         echo "${javac_version}" | grep -E -q '^javac (1[2-9])' && java_code_version=1.7
         echo "${javac_version}" | grep -E -q '^javac (2.*)' && java_code_version=1.7
@@ -6564,7 +6564,6 @@ if enabled bindings_python; then
     check_py_lib lxml          || disable_bindings_python "lxml"
     check_py_lib requests      || disable_bindings_python "requests"
     check_py_lib simplejson    || disable_bindings_python "simplejson"
-    check_py_lib future        || disable_bindings_python "future"
     check_python "(3,11,1)" && check_py_lib wheel && check_py_lib_version pip "(23,0,1)" && USE_PYTHON_PIP="yes"
 fi
 
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge.py b/mythtv/contrib/imports/mirobridge/mirobridge.py
index a7f87ffec00..eb1e19f7f71 100755
--- a/mythtv/contrib/imports/mirobridge/mirobridge.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: mirobridge.py   Maintains MythTV database with Miro's downloaded
 #                       video files.
@@ -34,7 +33,7 @@
 capable of downloading videos.
 '''
 
-__version__=u"v0.7.1"
+__version__="v0.7.1"
 # 0.1.0 Initial development
 # 0.2.0 Initial Alpha release for internal testing only
 # 0.2.1 Fixes from initial alpha test
@@ -218,7 +217,7 @@
 # 0.7.1 Added support for Miro 6.x. Miro 5.x can never be supported due to
 #       miro cli support being broken.
 
-examples_txt=u'''
+examples_txt='''
 For examples, please see the Mirobridge's wiki page at
 http://www.mythtv.org/wiki/MiroBridge
 '''
@@ -233,89 +232,89 @@
 import htmlentitydefs
 
 # Set command line options and arguments
-parser = OptionParser(usage=u"%prog usage: mirobridge -huevstdociVHSCWM [parameters]\n")
+parser = OptionParser(usage="%prog usage: mirobridge -huevstdociVHSCWM [parameters]\n")
 
 parser.add_option(  "-e", "--examples", action="store_true", default=False, dest="examples",
-                    help=u"Display examples for executing the mirobridge script")
+                    help="Display examples for executing the mirobridge script")
 parser.add_option(  "-v", "--version", action="store_true", default=False, dest="version",
-                    help=u"Display version and author information")
+                    help="Display version and author information")
 parser.add_option(  "-s", "--simulation", action="store_true", default=False, dest="simulation",
-                    help=u"Simulation (dry run), no files are copied, symlinks created or MythTV data "\
-                         u"bases altered. If option (-n) is NOT specified Miro auto downloads WILL take "\
-                         u"place. See option (-n) help for details.")
+                    help="Simulation (dry run), no files are copied, symlinks created or MythTV data "\
+                         "bases altered. If option (-n) is NOT specified Miro auto downloads WILL take "\
+                         "place. See option (-n) help for details.")
 parser.add_option(  "-t", "--testenv", action="store_true", default=False, dest="testenv",
-                    help=u"Test that the local environment can run all mirobridge functionality")
+                    help="Test that the local environment can run all mirobridge functionality")
 parser.add_option(  "-n", "--no_autodownload", action="store_true", default=False, dest="no_autodownload",
-                    help=u"Do not perform Miro Channel updates, video expiry and auto-downloadings. "\
-                         u"Default is to perform all perform all Channel maintenance features.")
+                    help="Do not perform Miro Channel updates, video expiry and auto-downloadings. "\
+                         "Default is to perform all perform all Channel maintenance features.")
 parser.add_option(  "-o", "--nosubdirs", action="store_true", default=False, dest="nosubdirs",
-                    help=u"Organise MythVideo's Miro directory WITHOUT Miro channel subdirectories. "\
-                         u"The default is to have Channel subdirectories.")
+                    help="Organise MythVideo's Miro directory WITHOUT Miro channel subdirectories. "\
+                         "The default is to have Channel subdirectories.")
 parser.add_option(  "-c", "--channel", metavar="CHANNEL_ID:CHANNEL_NUM", default="", dest="channel",
-                    help=u'Specifies the channel id that is used for Miros unplayed recordings. Enter '\
-                         u'as "xxxx:yyy". Default is 9999:999. Be warned that once you change the '\
-                         u'default channel_id "9999" you must always use this option!')
+                    help='Specifies the channel id that is used for Miros unplayed recordings. Enter '\
+                         'as "xxxx:yyy". Default is 9999:999. Be warned that once you change the '\
+                         'default channel_id "9999" you must always use this option!')
 parser.add_option(  "-i", "--import_opml", metavar="OPMLFILEPATH", default="", dest="import_opml",
-                    help=u'Import Miro exported OPML file containing Channel configurations. File '\
-                         u'name must be a fully qualified path. This option is exclusive to Miro '\
-                         u'v2.5.x and higher.')
+                    help='Import Miro exported OPML file containing Channel configurations. File '\
+                         'name must be a fully qualified path. This option is exclusive to Miro '\
+                         'v2.5.x and higher.')
 parser.add_option(  "-V", "--verbose", action="store_true", default=False, dest="verbose",
-                    help=u"Display verbose messages when processing")
+                    help="Display verbose messages when processing")
 parser.add_option(  "-H", "--hostname", metavar="HOSTNAME", default="", dest="hostname",
-                    help=u"MythTV Backend hostname mirobridge is to up date")
+                    help="MythTV Backend hostname mirobridge is to up date")
 parser.add_option(  "-S", "--sleeptime", metavar="SLEEP_DELAY_SECONDS", default="", dest="sleeptime",
-                    help=u"The amount of seconds to wait for an auto download to start.\nThe default "\
-                         u"is 60 seconds, but this may need to be adjusted for slower Internet connections.")
+                    help="The amount of seconds to wait for an auto download to start.\nThe default "\
+                         "is 60 seconds, but this may need to be adjusted for slower Internet connections.")
 parser.add_option(  "-C", "--addchannel", metavar="ICONFILE_PATH", default="OFF", dest="addchannel",
-                    help=u'Add a Miro Channel record to MythTV. This gets rid of the "#9999 #9999" '\
-                         u'on the Watch Recordings screen and replaces it with the usual\nthe channel '\
-                         u'number and channel name.\nThe default if not overridden by the (-c) option '\
-                         u'is channel number 999.\nIf a filename and path is supplied it will be set '\
-                         u'as the channels icon. Make sure your override channel number is NOT one of '\
-                         u'your current MythTV channel numbers.\nThis option is typically only used '\
-                         u'once as there can only be one Miro channel record at a time.')
+                    help='Add a Miro Channel record to MythTV. This gets rid of the "#9999 #9999" '\
+                         'on the Watch Recordings screen and replaces it with the usual\nthe channel '\
+                         'number and channel name.\nThe default if not overridden by the (-c) option '\
+                         'is channel number 999.\nIf a filename and path is supplied it will be set '\
+                         'as the channels icon. Make sure your override channel number is NOT one of '\
+                         'your current MythTV channel numbers.\nThis option is typically only used '\
+                         'once as there can only be one Miro channel record at a time.')
 parser.add_option(  "-N", "--new_watch_copy", action="store_true", default=False, dest="new_watch_copy",
-                    help=u'For ALL Miro Channels: Use the "Watch Recording" screen to watch new Miro '\
-                         u'downloads then once watched copy the videos, icons, screen shot and metadata '\
-                         u'to MythVideo. Once coping is complete delete the video from Miro.\nThis option '\
-                         u'overrides any "mirobridge.conf" settings.')
+                    help='For ALL Miro Channels: Use the "Watch Recording" screen to watch new Miro '\
+                         'downloads then once watched copy the videos, icons, screen shot and metadata '\
+                         'to MythVideo. Once coping is complete delete the video from Miro.\nThis option '\
+                         'overrides any "mirobridge.conf" settings.')
 parser.add_option(  "-W", "--watch_only", action="store_true", default=False, dest="watch_only",
-                    help=u'For ALL Miro Channels: Only use "Watch Recording" never move any Miro videos '\
-                         u'to MythVideo.\nThis option overrides any "mirobridge.conf" settings.')
+                    help='For ALL Miro Channels: Only use "Watch Recording" never move any Miro videos '\
+                         'to MythVideo.\nThis option overrides any "mirobridge.conf" settings.')
 parser.add_option(  "-M", "--mythvideo_only", action="store_true", default=False, dest="mythvideo_only",
-                    help=u'For ALL Miro Channel videos: Copy newly downloaded Miro videos to MythVideo '\
-                         u'and removed from Miro. These Miro videos never appear in the MythTV "Watch '\
-                         u'Recording" screen.\nThis option overrides any "mirobridge.conf" settings.')
+                    help='For ALL Miro Channel videos: Copy newly downloaded Miro videos to MythVideo '\
+                         'and removed from Miro. These Miro videos never appear in the MythTV "Watch '\
+                         'Recording" screen.\nThis option overrides any "mirobridge.conf" settings.')
 
 
 # Global variables
 opts, args = parser.parse_args() # Command line arguments and options
 local_only = True
-dir_dict          = {u'posterdir': u"VideoArtworkDir",     u'bannerdir': u'mythvideo.bannerDir',
-                     u'fanartdir': u'mythvideo.fanartDir', u'episodeimagedir': u'mythvideo.screenshotDir',
-                     u'mythvideo': u'VideoStartupDir'}
-vid_graphics_dirs = {u'default'  : u'', u'mythvideo': u'', u'posterdir'      : u'',
-                     u'bannerdir': u'', u'fanartdir': u'', u'episodeimagedir': u'',}
-key_trans         = {u'filename'  : u'mythvideo', u'coverfile': u'posterdir',
-                     u'banner'    : u'bannerdir', u'fanart'   : u'fanartdir',
-                     u'screenshot': u'episodeimagedir'}
-
-graphic_suffix    = {u'default'  : u'',        u'mythvideo': u'',        u'posterdir': u'_coverart',
-                     u'bannerdir': u'_banner', u'fanartdir': u'_fanart', u'episodeimagedir': u'_screenshot',}
-graphic_path_suffix = u"%s%s%s.%s"
-graphic_name_suffix = u"%s%s.%s"
-
-storagegroupnames = {u'Default' :  u'default',  u'Videos'     : u'mythvideo',
-                     u'Coverart': u'posterdir', u'Banners'    : u'bannerdir',
-                     u'Fanart'  : u'fanartdir', u'Screenshots': u'episodeimagedir'}
+dir_dict          = {'posterdir': "VideoArtworkDir",     'bannerdir': 'mythvideo.bannerDir',
+                     'fanartdir': 'mythvideo.fanartDir', 'episodeimagedir': 'mythvideo.screenshotDir',
+                     'mythvideo': 'VideoStartupDir'}
+vid_graphics_dirs = {'default'  : '', 'mythvideo': '', 'posterdir'      : '',
+                     'bannerdir': '', 'fanartdir': '', 'episodeimagedir': '',}
+key_trans         = {'filename'  : 'mythvideo', 'coverfile': 'posterdir',
+                     'banner'    : 'bannerdir', 'fanart'   : 'fanartdir',
+                     'screenshot': 'episodeimagedir'}
+
+graphic_suffix    = {'default'  : '',        'mythvideo': '',        'posterdir': '_coverart',
+                     'bannerdir': '_banner', 'fanartdir': '_fanart', 'episodeimagedir': '_screenshot',}
+graphic_path_suffix = "%s%s%s.%s"
+graphic_name_suffix = "%s%s.%s"
+
+storagegroupnames = {'Default' :  'default',  'Videos'     : 'mythvideo',
+                     'Coverart': 'posterdir', 'Banners'    : 'bannerdir',
+                     'Fanart'  : 'fanartdir', 'Screenshots': 'episodeimagedir'}
 storagegroups={} # The gobal dictionary is only populated with the current hosts storage group entries
-image_extensions = [u"png", u"jpg", u"bmp"]
+image_extensions = ["png", "jpg", "bmp"]
 simulation = False
 verbose = False
 ffmpeg = True
 channel_id = 9999
 channel_num = 999
-symlink_filename_format = u"%s - %s"
+symlink_filename_format = "%s - %s"
 flat = False                     # The MythVideo Miro directory structure flat or channel subdirectories
 download_sleeptime = float(60)    # The default value for the time to wait for auto downloading to start
 channel_icon_override = []
@@ -327,19 +326,19 @@
 test_environment = False
 requirements_are_met = True        # Used with the (-t) test environment option
 imagemagick = True
-mythcommflag_recordings = u'%s -c %%s -s "%%s" --rebuild' # or u'mythcommflag -f "%s" --rebuild'
-mythcommflag_videos = u'%s --rebuild --video "%%s"'
-filename_char_filter = u"/%\000"
-emptyTitle = u'_NO_TITLE_From_Miro'
-emptySubTitle = u'_NO_SUBTITLE_From_Miro'
+mythcommflag_recordings = '%s -c %%s -s "%%s" --rebuild' # or u'mythcommflag -f "%s" --rebuild'
+mythcommflag_videos = '%s --rebuild --video "%%s"'
+filename_char_filter = "/%\000"
+emptyTitle = '_NO_TITLE_From_Miro'
+emptySubTitle = '_NO_SUBTITLE_From_Miro'
 
 
 # Initalize Report Statistics:
-statistics = {u'WR_watched': 0,                     u'Miro_marked_watch_seen': 0,
-              u'Miro_videos_deleted': 0,            u'Miros_videos_downloaded': 0,
-              u'Miros_MythVideos_video_removed': 0, u'Miros_MythVideos_added': 0,
-              u'Miros_MythVideos_copied': 0,        u'Total_unwatched': 0,
-              u'Total_Miro_expiring': 0,            u'Total_Miro_MythVideos': 0}
+statistics = {'WR_watched': 0,                     'Miro_marked_watch_seen': 0,
+              'Miro_videos_deleted': 0,            'Miros_videos_downloaded': 0,
+              'Miros_MythVideos_video_removed': 0, 'Miros_MythVideos_added': 0,
+              'Miros_MythVideos_copied': 0,        'Total_unwatched': 0,
+              'Total_Miro_expiring': 0,            'Total_Miro_MythVideos': 0}
 
 
 class OutStreamEncoder(object):
@@ -367,13 +366,13 @@ def __getattr__(self, attr):
 sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
 
 # Create logger
-logger = logging.getLogger(u"mirobridge")
+logger = logging.getLogger("mirobridge")
 logger.setLevel(logging.DEBUG)
 # Create console handler and set level to debug
 ch = logging.StreamHandler()
 ch.setLevel(logging.DEBUG)
 # Create formatter
-formatter = logging.Formatter(u"%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 # Add formatter to ch
 ch.setFormatter(formatter)
 # Add ch to logger
@@ -384,14 +383,14 @@ def __getattr__(self, attr):
     from pyparsing import *
     import pyparsing
     if pyparsing.__version__ < "1.5.0":
-        logger.critical(u"The python library 'pyparsing' must be at version 1.5.0 or higher. "\
-                        u"Your version is v%s" % pyparsing.__version__)
+        logger.critical("The python library 'pyparsing' must be at version 1.5.0 or higher. "\
+                        "Your version is v%s" % pyparsing.__version__)
         sys.exit(1)
 except Exception, e:
-    logger.critical(u"The python library 'pyparsing' must be installed and be version 1.5.0 or "\
-                    u"higher, error(%s)" % e)
+    logger.critical("The python library 'pyparsing' must be installed and be version 1.5.0 or "\
+                    "higher, error(%s)" % e)
     sys.exit(1)
-logger.info(u"Using python library 'pyparsing' version %s" % pyparsing.__version__)
+logger.info("Using python library 'pyparsing' version %s" % pyparsing.__version__)
 
 
 # Find out if the MythTV python bindings can be accessed and instances can be created
@@ -408,25 +407,25 @@ def __getattr__(self, attr):
         #Create an instance of each: MythDB, MythVideo
         mythdb = MythDB()
     except MythError, e:
-        print u'\n! Warning - %s' % e.args[0]
+        print '\n! Warning - %s' % e.args[0]
         filename = os.path.expanduser("~")+'/.mythtv/config.xml'
         if not os.path.isfile(filename):
-            logger.critical(u'A correctly configured (%s) file must exist\n' % filename)
+            logger.critical('A correctly configured (%s) file must exist\n' % filename)
         else:
-            logger.critical(u'Check that (%s) is correctly configured\n' % filename)
+            logger.critical('Check that (%s) is correctly configured\n' % filename)
         sys.exit(1)
     except Exception, e:
-        logger.critical(u"Creating an instance caused an error for one of: MythDB or "\
-                        u"MythVideo, error(%s)\n" % e)
+        logger.critical("Creating an instance caused an error for one of: MythDB or "\
+                        "MythVideo, error(%s)\n" % e)
         sys.exit(1)
     localhostname = mythdb.gethostname()
     try:
         mythbeconn = MythBE(backend=localhostname, db=mythdb)
     except MythError, e:
-        logger.critical(u'MiroBridge must be run on a MythTV backend, error(%s)' % e.args[0])
+        logger.critical('MiroBridge must be run on a MythTV backend, error(%s)' % e.args[0])
         sys.exit(1)
 except Exception, e:
-    logger.critical(u"MythTV python bindings could not be imported, error(%s)" % e)
+    logger.critical("MythTV python bindings could not be imported, error(%s)" % e)
     sys.exit(1)
 
 # Find out if the Miro python bindings can be accessed and instances can be created
@@ -486,35 +485,35 @@ def __getattr__(self, attr):
         miroConfiguration = config.get
         pass
 except Exception, e:
-    logger.critical(u"Importing Miro functions has an issue. Miro must be installed "\
-                    u"and functional, error(%s)", e)
+    logger.critical("Importing Miro functions has an issue. Miro must be installed "\
+                    "and functional, error(%s)", e)
     sys.exit(1)
 
-logger.info(u"Miro Bridge version %s with Miro version %s" % \
+logger.info("Miro Bridge version %s with Miro version %s" % \
                     (__version__, miroConfiguration(prefs.APP_VERSION)))
-if miroConfiguration(prefs.APP_VERSION) < u"2.0.3":
-    logger.critical((u"Your version of Miro (v%s) is not recent enough. Miro v2.0.3 is "\
-                     u"the minimum and it is preferred that you upgrade to Miro v2.5.2 or "\
-                     u"later.") % miroConfiguration(prefs.APP_VERSION))
+if miroConfiguration(prefs.APP_VERSION) < "2.0.3":
+    logger.critical(("Your version of Miro (v%s) is not recent enough. Miro v2.0.3 is "\
+                     "the minimum and it is preferred that you upgrade to Miro v2.5.2 or "\
+                     "later.") % miroConfiguration(prefs.APP_VERSION))
     sys.exit(1)
 
 try:
-    if miroConfiguration(prefs.APP_VERSION) < u"2.5.2":
+    if miroConfiguration(prefs.APP_VERSION) < "2.5.2":
         logger.info("Using mirobridge_interpreter_2_0_3")
         from mirobridge.mirobridge_interpreter_2_0_3 import MiroInterpreter
-    elif miroConfiguration(prefs.APP_VERSION) < u"3.0":
+    elif miroConfiguration(prefs.APP_VERSION) < "3.0":
         logger.info("Using mirobridge_interpreter_2_5_2")
         from mirobridge.mirobridge_interpreter_2_5_2 import MiroInterpreter
-    elif miroConfiguration(prefs.APP_VERSION) < u"3.5":
+    elif miroConfiguration(prefs.APP_VERSION) < "3.5":
         logger.info("Using mirobridge_interpreter_3_0_0")
         from mirobridge.mirobridge_interpreter_3_0_0 import MiroInterpreter
-    elif miroConfiguration(prefs.APP_VERSION) < u"4.0":
+    elif miroConfiguration(prefs.APP_VERSION) < "4.0":
         logger.info("Using mirobridge_interpreter_3_5_0")
         from mirobridge.mirobridge_interpreter_3_5_0 import MiroInterpreter
-    elif miroConfiguration(prefs.APP_VERSION) < u"5.0":
+    elif miroConfiguration(prefs.APP_VERSION) < "5.0":
         logger.info("Using mirobridge_interpreter_4_0_2")
         from mirobridge.mirobridge_interpreter_4_0_2 import MiroInterpreter
-    elif miroConfiguration(prefs.APP_VERSION) < u"6.0":
+    elif miroConfiguration(prefs.APP_VERSION) < "6.0":
         logger.critical('''
 Miro version 5.x cannot be supported due to that version not supporting
 a CLI mode. Use versions 4.0.2+ or 6.0+ but not any v5.''')
@@ -524,10 +523,10 @@ def __getattr__(self, attr):
         from mirobridge.mirobridge_interpreter_6_0_0 import MiroInterpreter
     from mirobridge.metadata import MetaData
 except Exception, e:
-    logger.critical(u"Importing mirobridge functions has failed. At least a 'mirobridge_interpreter' "\
-                    u"file that matches your Miro version must be in the subdirectory 'mirobridge'.\n'"\
-                    u"e.g. mirobridge_interpreter_2_0_3.py', 'mirobridge_interpreter_2_5_2.py' ... etc, "\
-                    u"error(%s)" % e)
+    logger.critical("Importing mirobridge functions has failed. At least a 'mirobridge_interpreter' "\
+                    "file that matches your Miro version must be in the subdirectory 'mirobridge'.\n'"\
+                    "e.g. mirobridge_interpreter_2_0_3.py', 'mirobridge_interpreter_2_5_2.py' ... etc, "\
+                    "error(%s)" % e)
     sys.exit(1)
 
 def _can_int(x):
@@ -571,12 +570,12 @@ def sanitiseFileName(name):
     return a sanitised valid file name
     '''
     global filename_char_filter
-    if name is None or name == u'':
-        return u'_'
+    if name is None or name == '':
+        return '_'
     for char in filename_char_filter:
-        name = name.replace(char, u'_')
-    if name[0] == u'.':
-        name = u'_'+name[1:]
+        name = name.replace(char, '_')
+    if name[0] == '.':
+        name = '_'+name[1:]
     return name
 # end sanitiseFileName()
 
@@ -587,7 +586,7 @@ def useImageMagick(cmd):
     >>> 0
     >>> -1
     """
-    return subprocess.call(u'%s > /dev/null' % cmd, shell=True)
+    return subprocess.call('%s > /dev/null' % cmd, shell=True)
 # end useImageMagick()
 
 class singleinstance(object):
@@ -655,7 +654,7 @@ def isMiroRunning():
     return False if Miro is NOT running
     '''
     try:
-        p = subprocess.Popen(u'ps aux | grep "miro.real"', shell=True, bufsize=4096,
+        p = subprocess.Popen('ps aux | grep "miro.real"', shell=True, bufsize=4096,
                              stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                              close_fds=True)
     except:
@@ -669,12 +668,12 @@ def isMiroRunning():
             data = unicode(data, 'utf8')
         except (UnicodeEncodeError, TypeError):
             pass
-        if data.find(u'grep') != -1:
+        if data.find('grep') != -1:
             continue
 
-        if data.find(u'miro.real') != -1:
-            logger.critical(u"Miro is already running and therefore Miro Bridge should not be run:")
-            logger.critical(u"(%s)" % data)
+        if data.find('miro.real') != -1:
+            logger.critical("Miro is already running and therefore Miro Bridge should not be run:")
+            logger.critical("(%s)" % data)
             break
 
     return True
@@ -704,7 +703,7 @@ def delOldRecorded(chanid, starttime, endtime, title, \
     uses the oldrecorded table outside of its original intent.
     return nothing
     '''
-    sql_cmd = u"""DELETE FROM `mythconverg`.`oldrecorded`
+    sql_cmd = """DELETE FROM `mythconverg`.`oldrecorded`
                         WHERE `oldrecorded`.`chanid` = '%s'
                           AND `oldrecorded`.`starttime` = '%s'
                           AND `oldrecorded`.`endtime` = '%s';"""
@@ -718,7 +717,7 @@ def delRecorded(chanid, starttime):
     may not exist.
     return nothing
     '''
-    sql_cmd = u"""DELETE FROM `mythconverg`.`recorded`
+    sql_cmd = """DELETE FROM `mythconverg`.`recorded`
                         WHERE `recorded`.`chanid` = %s
                           AND `recorded`.`starttime` = '%s';"""
     sql_del_a_record(sql_cmd % (chanid, set_del_datatime(starttime)))
@@ -750,10 +749,10 @@ def hashFile(filename):
     return u'' if the was an error with the video file or the video file length was zero bytes
     '''
     # Use the MythVideo hashing protocol when the video is in a storage groups
-    if filename[0] != u'/':
-        hash_value = mythbeconn.getHash(filename, u'Videos')
-        if hash_value == u'NULL':
-            return u''
+    if filename[0] != '/':
+        hash_value = mythbeconn.getHash(filename, 'Videos')
+        if hash_value == 'NULL':
+            return ''
         else:
             return hash_value
 
@@ -766,7 +765,7 @@ def hashFile(filename):
         filesize = os.path.getsize(filename)
         hash = filesize
         if filesize < 65536 * 2:    # Video file is too small
-               return u''
+               return ''
         for x in range(65536/bytesize):
                 buffer = f.read(bytesize)
                 (l_value,)= struct.unpack(longlongformat, buffer)
@@ -783,28 +782,28 @@ def hashFile(filename):
         return returnedhash
 
     except(IOError):    # Accessing to this video file caused and error
-        return u''
+        return ''
 # end hashFile()
 
 
-def rtnAbsolutePath(relpath, filetype=u'mythvideo'):
+def rtnAbsolutePath(relpath, filetype='mythvideo'):
     '''Check if there is a Storage Group for the file type (mythvideo, coverfile, banner, fanart,
     screenshot)    and form an appropriate absolute path and file name.
     return an absolute path and file name
     return the relpath sting if the file does not actually exist in the absolute path location
     '''
-    if relpath is None or relpath == u'':
+    if relpath is None or relpath == '':
         return relpath
 
     # There is a chance that this is already an absolute path
-    if relpath[0] == u'/':
+    if relpath[0] == '/':
         return relpath
 
     if not storagegroups.has_key(filetype):
         return relpath    # The Videos storage group path does not exist at all the metadata entry is useless
 
     for directory in storagegroups[filetype]:
-        abpath = u"%s/%s" % (directory, relpath)
+        abpath = "%s/%s" % (directory, relpath)
         if os.path.isfile(abpath): # The file must actually exist locally
             return abpath
     else:
@@ -823,18 +822,18 @@ def getStorageGroups():
                 try:
                     dirname = unicode(record.dirname, 'utf8')
                 except (UnicodeDecodeError):
-                    logger.error((u"The local Storage group (%s) directory contained\ncharacters "\
-                                  u"that caused a UnicodeDecodeError. This storage group has been "\
-                                  u"rejected.") % (record.groupname))
+                    logger.error(("The local Storage group (%s) directory contained\ncharacters "\
+                                  "that caused a UnicodeDecodeError. This storage group has been "\
+                                  "rejected.") % (record.groupname))
                     continue    # Skip any line that has non-utf8 characters in it
                 except (UnicodeEncodeError, TypeError):
                     dirname = record.dirname  # assume already unicode and pass unchanged
 
                 # Add a slash if missing to any storage group dirname
-                if dirname[-1:] == u'/':
+                if dirname[-1:] == '/':
                     storagegroups[storagegroupnames[record.groupname]] = dirname
                 else:
-                    storagegroups[storagegroupnames[record.groupname]] = dirname+u'/'
+                    storagegroups[storagegroupnames[record.groupname]] = dirname+'/'
             continue
 
     if len(storagegroups):
@@ -842,7 +841,7 @@ def getStorageGroups():
         storagegroup_ok = True
         for key in storagegroups.keys():
             if not os.path.isdir(storagegroups[key]):
-                logger.critical(u"The Storage group (%s) directory (%s) does not exist" % \
+                logger.critical("The Storage group (%s) directory (%s) does not exist" % \
                                         (key, storagegroups[key]))
                 storagegroup_ok = False
         if not storagegroup_ok:
@@ -859,66 +858,66 @@ def getMythtvDirectories():
 
     # When there is NO SG for Videos then ALL graphics paths MUST be local paths set in the FE and accessible
     # from the backend
-    if storagegroups.has_key(u'mythvideo'):
+    if storagegroups.has_key('mythvideo'):
         local_only = False
         # Pick up storage groups first
         for key in storagegroups.keys():
             vid_graphics_dirs[key] = storagegroups[key]
         for key in dir_dict.keys():
-            if key == u'default' or key == u'mythvideo':
+            if key == 'default' or key == 'mythvideo':
                 continue
             if not storagegroups.has_key(key):
                 # Set fall back graphics directory to Videos
-                vid_graphics_dirs[key] = storagegroups[u'mythvideo']
+                vid_graphics_dirs[key] = storagegroups['mythvideo']
                 # Set fall back SG graphics directory to Videos
-                storagegroups[key] = storagegroups[u'mythvideo']
+                storagegroups[key] = storagegroups['mythvideo']
     else:
         local_only = True
-        if storagegroups.has_key(u'default'):
-            vid_graphics_dirs[u'default'] = storagegroups[u'default']
+        if storagegroups.has_key('default'):
+            vid_graphics_dirs['default'] = storagegroups['default']
 
     if local_only:
-        logger.warning(u'There is no "Videos" Storage Group set so ONLY MythTV Frontend local '\
-                       u'paths for videos and graphics that are accessible from this MythTV '\
-                       u'Backend can be used.')
+        logger.warning('There is no "Videos" Storage Group set so ONLY MythTV Frontend local '\
+                       'paths for videos and graphics that are accessible from this MythTV '\
+                       'Backend can be used.')
 
     for key in dir_dict.keys():
         if vid_graphics_dirs[key]:
             continue
         graphics_dir = mythdb.settings[localhostname][dir_dict[key]]
         # Only use path from MythTV if one was found
-        if key == u'mythvideo':
+        if key == 'mythvideo':
             if graphics_dir:
-                tmp_directories = graphics_dir.split(u':')
+                tmp_directories = graphics_dir.split(':')
                 if len(tmp_directories):
                     for i in range(len(tmp_directories)):
                         tmp_directories[i] = tmp_directories[i].strip()
-                        if tmp_directories[i] != u'':
+                        if tmp_directories[i] != '':
                             if os.path.exists(tmp_directories[i]):
-                                if tmp_directories[i][-1] != u'/':
-                                    tmp_directories[i]+=u'/'
+                                if tmp_directories[i][-1] != '/':
+                                    tmp_directories[i]+='/'
                                 vid_graphics_dirs[key] = tmp_directories[i]
                                 break
                             else:
-                                 logger.error(u"MythVideo video directory (%s) does not exist(%s)" % \
+                                 logger.error("MythVideo video directory (%s) does not exist(%s)" % \
                                                     (key, tmp_directories[i]))
             else:
-                 logger.error(u"MythVideo video directory (%s) is not set" % (key, ))
+                 logger.error("MythVideo video directory (%s) is not set" % (key, ))
 
-        if key != u'mythvideo':
+        if key != 'mythvideo':
             if graphics_dir and os.path.exists(graphics_dir):
-                if graphics_dir[-1] != u'/':
-                    graphics_dir+=u'/'
+                if graphics_dir[-1] != '/':
+                    graphics_dir+='/'
                 vid_graphics_dirs[key] = graphics_dir
             else:    # There is the chance that MythTv DB does not have a dir
-                 logger.error(u"(%s) directory is not set or does not exist(%s)" % (key, dir_dict[key]))
+                 logger.error("(%s) directory is not set or does not exist(%s)" % (key, dir_dict[key]))
 
     # Make sure there is a directory set for Videos and other graphics directories on this host
     dir_for_all = True
     for key in vid_graphics_dirs.keys():
         if not vid_graphics_dirs[key]:
-            logger.critical(u"There must be a directory for Videos and each graphics type "\
-                            u"the (%s) directory is missing." % (key))
+            logger.critical("There must be a directory for Videos and each graphics type "\
+                            "the (%s) directory is missing." % (key))
             dir_for_all = False
     if not dir_for_all:
         sys.exit(1)
@@ -927,8 +926,8 @@ def getMythtvDirectories():
     access_issue = False
     for key in vid_graphics_dirs.keys():
         if not os.access(vid_graphics_dirs[key], os.F_OK | os.R_OK | os.W_OK):
-            logger.critical(u"\nEvery Video and graphics directory must be read/writable for "\
-                            u"Miro Bridge to function. There is a permissions issue with (%s)." % \
+            logger.critical("\nEvery Video and graphics directory must be read/writable for "\
+                            "Miro Bridge to function. There is a permissions issue with (%s)." % \
                                     (vid_graphics_dirs[key], ))
             access_issue = True
     if access_issue:
@@ -939,7 +938,7 @@ def getMythtvDirectories():
         dir_types={'posterdir' : "Cover art  ", 'bannerdir': 'Banners    ',
                    'fanartdir' : 'Fan art    ', 'episodeimagedir': 'Screenshots',
                     'mythvideo': 'Video      ', 'default': 'Default    '}
-        sys.stdout.write(u"""
+        sys.stdout.write("""
 ==========================================================================================
 Listed below are the types and base directories that will be use for processing.
 The list reflects your current configuration for the '%s' back end
@@ -952,10 +951,10 @@ def getMythtvDirectories():
             if storagegroups.has_key(key):
                 if vid_graphics_dirs[key] == storagegroups[key]:
                     sg_flag = 'YES'
-            sys.stdout.write(u"Type: %s - SG-%s - Directory: (%s)\n" % \
+            sys.stdout.write("Type: %s - SG-%s - Directory: (%s)\n" % \
                                     (dir_types[key], sg_flag, vid_graphics_dirs[key]))
         sys.stdout.write(\
-u"""------------------------------------------------------------------------------------------
+"""------------------------------------------------------------------------------------------
 If a directory you set from a separate Front end is not displayed it means
 that the directory is not accessible from this backend OR
 you must add the missing directories using the Front end on this Back end.
@@ -972,77 +971,77 @@ def setUseroptions():
     global simulation, verbose, channel_icon_override, channel_watch_only, channel_mythvideo_only
     global vid_graphics_dirs, tv_channels, movie_trailers, filename_char_filter
 
-    useroptions=u"~/.mythtv/mirobridge.conf"
+    useroptions="~/.mythtv/mirobridge.conf"
 
-    if useroptions[0]==u'~':
-        useroptions=os.path.expanduser(u"~")+useroptions[1:]
+    if useroptions[0]=='~':
+        useroptions=os.path.expanduser("~")+useroptions[1:]
     if os.path.isfile(useroptions) == False:
         logger.info(
-            u"There was no mirobridge configuration file found (%s)" % useroptions)
+            "There was no mirobridge configuration file found (%s)" % useroptions)
         return
 
     cfg = ConfigParser.SafeConfigParser()
     cfg.read(useroptions)
     for section in cfg.sections():
-        if section[:5] == u'File ':
+        if section[:5] == 'File ':
             continue
-        if section == u'variables':
+        if section == 'variables':
             for option in cfg.options(section):
-                if option == u'filename_char_filter':
+                if option == 'filename_char_filter':
                     for char in cfg.get(section, option):
                         filename_char_filter+=char
                     continue
-        if section == u'icon_override':
+        if section == 'icon_override':
             # Add the Channel names to the array of Channels that are to use their item's icon
             for option in cfg.options(section):
                 channel_icon_override.append(option)
             continue
-        if section == u'watch_only':
+        if section == 'watch_only':
             # Add the Channel names to the array of Channels that will only not be moved to MythVideo
             for option in cfg.options(section):
-                if option == u'all miro channels':
-                    channel_watch_only = [u'all']
+                if option == 'all miro channels':
+                    channel_watch_only = ['all']
                     break
                 else:
                     channel_watch_only.append(filter(is_not_punct_char, option.lower()))
             continue
-        if section == u'mythvideo_only':
+        if section == 'mythvideo_only':
             # Add the Channel names to the array of Channels that will be moved to MythVideo only
             for option in cfg.options(section):
-                if option == u'all miro channels':
-                    channel_mythvideo_only[u'all'] = cfg.get(section, option)
+                if option == 'all miro channels':
+                    channel_mythvideo_only['all'] = cfg.get(section, option)
                     break
                 else:
                     channel_mythvideo_only[filter(is_not_punct_char, option.lower())] = \
                                 cfg.get(section, option)
             for key in channel_mythvideo_only.keys():
-                if not channel_mythvideo_only[key].startswith(vid_graphics_dirs[u'mythvideo']):
-                    logger.critical((u"All Mythvideo only configuration (%s) directories (%s) must "\
-                                     u"be a subdirectory of the MythVideo base directory (%s).") % \
+                if not channel_mythvideo_only[key].startswith(vid_graphics_dirs['mythvideo']):
+                    logger.critical(("All Mythvideo only configuration (%s) directories (%s) must "\
+                                     "be a subdirectory of the MythVideo base directory (%s).") % \
                                             (key, channel_mythvideo_only[key],
-                                             vid_graphics_dirs[u'mythvideo']))
+                                             vid_graphics_dirs['mythvideo']))
                     sys.exit(1)
-                if channel_mythvideo_only[key][-1] != u'/':
-                    channel_mythvideo_only[key]+=u'/'
+                if channel_mythvideo_only[key][-1] != '/':
+                    channel_mythvideo_only[key]+='/'
             continue
-        if section == u'watch_then_copy':
+        if section == 'watch_then_copy':
             # Add the Channel names to the array of Channels once watched will be copied to MythVideo
             for option in cfg.options(section):
-                if option == u'all miro channels':
-                    channel_new_watch_copy[u'all'] = cfg.get(section, option)
+                if option == 'all miro channels':
+                    channel_new_watch_copy['all'] = cfg.get(section, option)
                     break
                 else:
                     channel_new_watch_copy[filter(is_not_punct_char, option.lower())] =\
                                  cfg.get(section, option)
             for key in channel_new_watch_copy.keys():
-                if not channel_new_watch_copy[key].startswith(vid_graphics_dirs[u'mythvideo']):
-                    logger.critical((u"All 'new->watch->copy' channel (%s) directory (%s) must "\
-                                     u"be a subdirectory of the MythVideo base directory (%s).") % \
+                if not channel_new_watch_copy[key].startswith(vid_graphics_dirs['mythvideo']):
+                    logger.critical(("All 'new->watch->copy' channel (%s) directory (%s) must "\
+                                     "be a subdirectory of the MythVideo base directory (%s).") % \
                                                 (key, channel_new_watch_copy[key],
-                                                 vid_graphics_dirs[u'mythvideo']))
+                                                 vid_graphics_dirs['mythvideo']))
                     sys.exit(1)
-                if channel_new_watch_copy[key][-1] != u'/':
-                    channel_new_watch_copy[key]+=u'/'
+                if channel_new_watch_copy[key][-1] != '/':
+                    channel_new_watch_copy[key]+='/'
             continue
 # end setUserconfig
 
@@ -1062,54 +1061,54 @@ def unescape(text):
        """
        def fixup(m):
           text = m.group(0)
-          if text[:2] == u"&#":
+          if text[:2] == "&#":
              # character reference
              try:
-                if text[:3] == u"&#x":
+                if text[:3] == "&#x":
                    return unichr(int(text[3:-1], 16))
                 else:
                    return unichr(int(text[2:-1]))
              except ValueError:
-                logger.warn(u"Remove HTML or XML character references: Value Error")
+                logger.warn("Remove HTML or XML character references: Value Error")
                 pass
           else:
              # named entity
              # reescape the reserved characters.
              try:
-                if text[1:-1] == u"amp":
-                   text = u"&amp;amp;"
-                elif text[1:-1] == u"gt":
-                   text = u"&amp;gt;"
-                elif text[1:-1] == u"lt":
-                   text = u"&amp;lt;"
+                if text[1:-1] == "amp":
+                   text = "&amp;amp;"
+                elif text[1:-1] == "gt":
+                   text = "&amp;gt;"
+                elif text[1:-1] == "lt":
+                   text = "&amp;lt;"
                 else:
-                   logger.info(u"%s" % text[1:-1])
+                   logger.info("%s" % text[1:-1])
                    text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
              except KeyError:
-                logger.warn(u"Remove HTML or XML character references: keyerror")
+                logger.warn("Remove HTML or XML character references: keyerror")
                 pass
           return text # leave as is
-       return re.sub(u"&#?\w+;", fixup, text)
+       return re.sub(r"&#?\w+;", fixup, text)
 
     details = {}
     if not description: # Is there anything to massage
         if extras:
-            details[u'plot'] = description
+            details['plot'] = description
             return details
         else:
             return description
 
-    director_text = u'Director: '
+    director_text = 'Director: '
     director_re = re.compile(director_text, re.UNICODE)
-    ratings_text = u'Rating: '
+    ratings_text = 'Rating: '
     ratings_re = re.compile(ratings_text, re.UNICODE)
 
     removeText = replaceWith("")
-    scriptOpen,scriptClose = makeHTMLTags(u"script")
+    scriptOpen,scriptClose = makeHTMLTags("script")
     scriptBody = scriptOpen + SkipTo(scriptClose) + scriptClose
     scriptBody.setParseAction(removeText)
 
-    anyTag,anyClose = makeHTMLTags(Word(alphas,alphanums+u":_"))
+    anyTag,anyClose = makeHTMLTags(Word(alphas,alphanums+":_"))
     anyTag.setParseAction(removeText)
     anyClose.setParseAction(removeText)
     htmlComment.setParseAction(removeText)
@@ -1122,45 +1121,45 @@ def fixup(m):
 
     # first pass leaves many blank lines, collapse these down
     repeatedNewlines = LineEnd() + OneOrMore(LineEnd())
-    repeatedNewlines.setParseAction(replaceWith(u"\n\n"))
+    repeatedNewlines.setParseAction(replaceWith("\n\n"))
     secondPass = repeatedNewlines.transformString(firstPass)
-    text = secondPass.replace(u"Link to Catalog\n ",u'')
+    text = secondPass.replace("Link to Catalog\n ",'')
     text = unescape(text)
 
     if extras:
-        text_lines = text.split(u'\n')
+        text_lines = text.split('\n')
         for index in range(len(text_lines)):
             text_lines[index] = text_lines[index].rstrip()
             index+=1
     else:
-        text_lines = [text.replace(u'\n', u' ')]
+        text_lines = [text.replace('\n', ' ')]
 
     if extras:
-        description = u''
+        description = ''
         for text in text_lines:
             if len(director_re.findall(text)):
-                details[u'director'] = text.replace(director_text, u'')
+                details['director'] = text.replace(director_text, '')
                 continue
             # probe the nature [...]Rating: 3.0/5 (1 vote cast)
             if len(ratings_re.findall(text)):
-                data = text[text.index(ratings_text):].replace(ratings_text, u'')
+                data = text[text.index(ratings_text):].replace(ratings_text, '')
                 try:
-                    number = data[:data.index(u'/')]
+                    number = data[:data.index('/')]
                     # HD trailers ratings are our of 5 not 10 like MythTV so must be multiplied by two
                     try:
-                        details[u'userrating'] = float(number) * 2
+                        details['userrating'] = float(number) * 2
                     except ValueError:
-                        details[u'userrating'] = 0.0
+                        details['userrating'] = 0.0
                 except:
-                    details[u'userrating'] = 0.0
+                    details['userrating'] = 0.0
                 text = text[:text.index(ratings_text)]
             if text.rstrip():
-                description+=text+u' '
+                description+=text+' '
     else:
-        description = text_lines[0].replace(u"[...]Rating:", u"[...] Rating:")
+        description = text_lines[0].replace("[...]Rating:", "[...] Rating:")
 
     if extras:
-        details[u'plot'] = description.rstrip()
+        details['plot'] = description.rstrip()
         return details
     else:
         return description
@@ -1186,7 +1185,7 @@ def getOldrecordedOrphans():
     recorded_array = list(mythdb.searchRecorded(chanid=channel_id,
                                                 hostname=localhostname))
     oldrecorded_array = list(mythdb.searchOldRecorded(chanid=channel_id, ))
-    videometadata = list(mythdb.searchVideos(category=u'Miro'))
+    videometadata = list(mythdb.searchVideos(category='Miro'))
 
     orphans = []
     for record in oldrecorded_array:
@@ -1196,13 +1195,13 @@ def getOldrecordedOrphans():
             if recorded['autoexpire'] == 9999:
                 continue
             #
-            if recorded[u'starttime'] == record[u'starttime'] and \
-                            recorded[u'endtime'] == record[u'endtime']:
+            if recorded['starttime'] == record['starttime'] and \
+                            recorded['endtime'] == record['endtime']:
                 break
         else:
             for video in videometadata:
-                if video[u'title'] == record[u'title'] and \
-                            video[u'subtitle'] == record[u'subtitle']:
+                if video['title'] == record['title'] and \
+                            video['subtitle'] == record['subtitle']:
                     break
             else:
                 orphans.append(record)
@@ -1210,8 +1209,8 @@ def getOldrecordedOrphans():
     for data in orphans:
         if simulation:
             logger.info(
-            u"Simulation: Remove orphaned oldrecorded record (%s - %s)" % \
-                            (data[u'title'], data[u'subtitle']))
+            "Simulation: Remove orphaned oldrecorded record (%s - %s)" % \
+                            (data['title'], data['subtitle']))
         else:
             try:
             # Sometimes a channel issues videos with identical publishing (starttime) dates.
@@ -1223,31 +1222,31 @@ def getOldrecordedOrphans():
                 pass
 
             # Attempt a clean up for orphaned recorded video files and/or graphics
-            metadata.cleanupVideoAndGraphics(u'%s%s_%s.%s' % \
-                    (vid_graphics_dirs[u'default'], channel_id,
-                     data[u'starttime'].strftime('%Y%m%d%H%M%S'), u'png'))
+            metadata.cleanupVideoAndGraphics('%s%s_%s.%s' % \
+                    (vid_graphics_dirs['default'], channel_id,
+                     data['starttime'].strftime('%Y%m%d%H%M%S'), 'png'))
 
             # Attempt a clean up for orphaned MythVideo files and/or
             # graphics from the Default directory
-            metadata.cleanupVideoAndGraphics(u'%s%s - %s.%s' % \
-                    (vid_graphics_dirs[u'default'], data[u'title'],
-                     data[u'subtitle'], u'png'))
+            metadata.cleanupVideoAndGraphics('%s%s - %s.%s' % \
+                    (vid_graphics_dirs['default'], data['title'],
+                     data['subtitle'], 'png'))
 
             # Attempt a clean up for orphaned MythVideo screenshot
-            metadata.cleanupVideoAndGraphics(u'%s%s - %s%s.%s' % \
-                (vid_graphics_dirs[u'episodeimagedir'], data[u'title'],
-                 data[u'subtitle'], graphic_suffix[u'episodeimagedir'],
-                 u'png'))
+            metadata.cleanupVideoAndGraphics('%s%s - %s%s.%s' % \
+                (vid_graphics_dirs['episodeimagedir'], data['title'],
+                 data['subtitle'], graphic_suffix['episodeimagedir'],
+                 'png'))
 
             # Remove any unique cover art graphic files
-            if data[u'title'].lower() in channel_icon_override:
-                metadata.cleanupVideoAndGraphics(u'%s%s - %s%s.%s' % \
-                (vid_graphics_dirs[u'posterdir'], data[u'title'],
-                 data[u'subtitle'], graphic_suffix[u'posterdir'], u'png'))
+            if data['title'].lower() in channel_icon_override:
+                metadata.cleanupVideoAndGraphics('%s%s - %s%s.%s' % \
+                (vid_graphics_dirs['posterdir'], data['title'],
+                 data['subtitle'], graphic_suffix['posterdir'], 'png'))
 
             displayMessage(
-                u"Removed orphaned Miro video and graphics files (%s - %s)" % \
-                                (data[u'title'], data[u'subtitle']))
+                "Removed orphaned Miro video and graphics files (%s - %s)" % \
+                                (data['title'], data['subtitle']))
 
     return orphans
     # end getOldrecordedOrphans()
@@ -1300,19 +1299,19 @@ def setSymbolic(filename, storagegroupkey, symbolic_name, allow_symlink=False):
     global local_only
 
     if not os.path.isfile(filename):
-        logger.error(u"The file (%s) must exist to create a symbolic link" % filename)
+        logger.error("The file (%s) must exist to create a symbolic link" % filename)
         return None
 
     ext = getExtention(filename)
-    if ext.lower() == u'm4v':
-        ext = u'mpg'
+    if ext.lower() == 'm4v':
+        ext = 'mpg'
 
     convert = False
-    if ext.lower() in [u'gif', u'jpeg', u'JPG', ]: # convert graphics to standard jpg and png types
-        ext = u'jpg'
+    if ext.lower() in ['gif', 'jpeg', 'JPG', ]: # convert graphics to standard jpg and png types
+        ext = 'jpg'
         convert = True
 
-    if storagegroupkey in storagegroups.keys() and storagegroupkey == u'default':
+    if storagegroupkey in storagegroups.keys() and storagegroupkey == 'default':
         sym_filepath = graphic_path_suffix % (storagegroups[storagegroupkey], symbolic_name,
                                               graphic_suffix[storagegroupkey], ext)
         sym_filename = graphic_name_suffix % (symbolic_name, graphic_suffix[storagegroupkey], ext)
@@ -1338,35 +1337,35 @@ def setSymbolic(filename, storagegroupkey, symbolic_name, allow_symlink=False):
 
     if simulation:
         if allow_symlink:
-            logger.info(u"Simulation: Used file (%s) to create symlink as (%s)" % \
+            logger.info("Simulation: Used file (%s) to create symlink as (%s)" % \
                                 (filename, sym_filepath))
         else:
-            logger.info(u"Simulation: Used file (%s) copy as (%s)" % (filename, sym_filepath))
+            logger.info("Simulation: Used file (%s) copy as (%s)" % (filename, sym_filepath))
         return sym_filename
 
     try:
         if allow_symlink:
             os.symlink(filename, sym_filepath)
-            displayMessage(u"Used file (%s) to created symlink (%s)" % (filename, sym_filepath))
+            displayMessage("Used file (%s) to created symlink (%s)" % (filename, sym_filepath))
         else:
             try:    # Every file but video files copied to support Storage groups
                 if convert:
-                    useImageMagick(u'convert "%s" "%s"' % (filename, sym_filepath))
-                    displayMessage(u"Convert and copy Miro file (%s) to file (%s)" % \
+                    useImageMagick('convert "%s" "%s"' % (filename, sym_filepath))
+                    displayMessage("Convert and copy Miro file (%s) to file (%s)" % \
                                         (filename, sym_filepath))
                 else:
                     shutil.copy2(filename, sym_filepath)
-                    displayMessage(u"Copied Miro file (%s) to file (%s)" % (filename, sym_filepath))
+                    displayMessage("Copied Miro file (%s) to file (%s)" % (filename, sym_filepath))
             except OSError, e:
-                logger.critical((u"Trying to copy the Miro file (%s) to the file (%s).\nError(%s)"\
-                                 u"\nThis maybe a permissions error (mirobridge.py does not have "\
-                                 u"permission to write to the directory).") % \
+                logger.critical(("Trying to copy the Miro file (%s) to the file (%s).\nError(%s)"\
+                                 "\nThis maybe a permissions error (mirobridge.py does not have "\
+                                 "permission to write to the directory).") % \
                                         (filename ,sym_filepath, e))
                 sys.exit(1)
     except OSError, e:
-        logger.critical((u"Trying to create the Miro file (%s) symlink (%s).\nError(%s)\nThis "\
-                         u"maybe a permissions error (mirobridge.py does not have permission to "\
-                         u"write to the directory).") % (sym_filepath, e))
+        logger.critical(("Trying to create the Miro file (%s) symlink (%s).\nError(%s)\nThis "\
+                         "maybe a permissions error (mirobridge.py does not have permission to "\
+                         "write to the directory).") % (sym_filepath, e))
         sys.exit(1)
 
     return sym_filename
@@ -1382,21 +1381,21 @@ def createOldRecordedRecord(item, start, end, inetref):
     tmp_oldrecorded={}
 
     # Create the oldrecorded dictionary
-    tmp_oldrecorded[u'chanid'] = channel_id
-    tmp_oldrecorded[u'starttime'] = start
-    tmp_oldrecorded[u'endtime'] = end
-    tmp_oldrecorded[u'title'] = item[u'channelTitle']
-    tmp_oldrecorded[u'subtitle'] = item[u'title']
-    tmp_oldrecorded[u'category'] = u'Miro'
-    tmp_oldrecorded[u'station'] = u'MIRO'
-    tmp_oldrecorded[u'inetref'] = inetref
-    tmp_oldrecorded[u'season'] = item[u'season']
-    tmp_oldrecorded[u'episode'] = item[u'episode']
+    tmp_oldrecorded['chanid'] = channel_id
+    tmp_oldrecorded['starttime'] = start
+    tmp_oldrecorded['endtime'] = end
+    tmp_oldrecorded['title'] = item['channelTitle']
+    tmp_oldrecorded['subtitle'] = item['title']
+    tmp_oldrecorded['category'] = 'Miro'
+    tmp_oldrecorded['station'] = 'MIRO'
+    tmp_oldrecorded['inetref'] = inetref
+    tmp_oldrecorded['season'] = item['season']
+    tmp_oldrecorded['episode'] = item['episode']
 
     try:
-        tmp_oldrecorded[u'description'] = massageDescription(item[u'description'])
+        tmp_oldrecorded['description'] = massageDescription(item['description'])
     except TypeError:
-        tmp_oldrecorded[u'description'] = item[u'description']
+        tmp_oldrecorded['description'] = item['description']
     return tmp_oldrecorded
     # end createOldRecordedRecord()
 
@@ -1411,77 +1410,77 @@ def createRecordedRecords(item):
     tmp_recordedprogram={}
 
     # Get any graphics that already exist
-    graphics = metadata.getMetadata(sanitiseFileName(item[u'channelTitle']))
+    graphics = metadata.getMetadata(sanitiseFileName(item['channelTitle']))
 
-    ffmpeg_details = metadata.getVideoDetails(item[u'videoFilename'])
-    start_end = getStartEndTimes(ffmpeg_details[u'duration'], item[u'downloadedTime'])
+    ffmpeg_details = metadata.getVideoDetails(item['videoFilename'])
+    start_end = getStartEndTimes(ffmpeg_details['duration'], item['downloadedTime'])
 
-    if item[u'releasedate'] is None:
-        item[u'releasedate'] = item[u'downloadedTime']
+    if item['releasedate'] is None:
+        item['releasedate'] = item['downloadedTime']
     try:
-        dummy = item[u'releasedate'].strftime('%Y-%m-%d')
+        dummy = item['releasedate'].strftime('%Y-%m-%d')
     except ValueError:
-        item[u'releasedate'] = item[u'downloadedTime']
+        item['releasedate'] = item['downloadedTime']
 
     # Create the recorded dictionary
-    tmp_recorded[u'chanid'] = channel_id
-    tmp_recorded[u'starttime'] = start_end[0]
-    tmp_recorded[u'endtime'] = start_end[1]
-    tmp_recorded[u'title'] = item[u'channelTitle']
-    tmp_recorded[u'subtitle'] = item[u'title']
-    tmp_recorded[u'season'] = item[u'season']
-    tmp_recorded[u'episode'] = item[u'episode']
-    tmp_recorded[u'inetref'] = graphics[u'inetref']
+    tmp_recorded['chanid'] = channel_id
+    tmp_recorded['starttime'] = start_end[0]
+    tmp_recorded['endtime'] = start_end[1]
+    tmp_recorded['title'] = item['channelTitle']
+    tmp_recorded['subtitle'] = item['title']
+    tmp_recorded['season'] = item['season']
+    tmp_recorded['episode'] = item['episode']
+    tmp_recorded['inetref'] = graphics['inetref']
     try:
-        tmp_recorded[u'description'] = massageDescription(item[u'description'])
+        tmp_recorded['description'] = massageDescription(item['description'])
     except TypeError:
         print
-        print u"Channel title(%s) subtitle(%s)" % (item[u'channelTitle'], item[u'title'])
-        print u"The 'massageDescription()' function could not remove HTML and XML tags from:"
-        print u"Description (%s)\n\n" % item[u'description']
-        tmp_recorded[u'description'] = item[u'description']
-    tmp_recorded[u'category'] = u'Miro'
-    tmp_recorded[u'hostname'] = localhostname
-    tmp_recorded[u'lastmodified'] = tmp_recorded[u'endtime']
-    tmp_recorded[u'filesize'] = item[u'size']
-    if item[u'releasedate'] is not None:
-        tmp_recorded[u'originalairdate'] = item[u'releasedate'].strftime('%Y-%m-%d')
-
-    basename = setSymbolic(item[u'videoFilename'], u'default', u"%s_%s" % \
+        print "Channel title(%s) subtitle(%s)" % (item['channelTitle'], item['title'])
+        print "The 'massageDescription()' function could not remove HTML and XML tags from:"
+        print "Description (%s)\n\n" % item['description']
+        tmp_recorded['description'] = item['description']
+    tmp_recorded['category'] = 'Miro'
+    tmp_recorded['hostname'] = localhostname
+    tmp_recorded['lastmodified'] = tmp_recorded['endtime']
+    tmp_recorded['filesize'] = item['size']
+    if item['releasedate'] is not None:
+        tmp_recorded['originalairdate'] = item['releasedate'].strftime('%Y-%m-%d')
+
+    basename = setSymbolic(item['videoFilename'], 'default', "%s_%s" % \
                                     (channel_id, start_end[2]), allow_symlink=True)
     if basename is not None:
-        tmp_recorded[u'basename'] = basename
+        tmp_recorded['basename'] = basename
     else:
-        logger.critical(u"The file (%s) must exist to create a recorded record" % \
-                                    item[u'videoFilename'])
+        logger.critical("The file (%s) must exist to create a recorded record" % \
+                                    item['videoFilename'])
         sys.exit(1)
 
-    tmp_recorded[u'progstart'] = start_end[0]
-    tmp_recorded[u'progend'] = start_end[1]
+    tmp_recorded['progstart'] = start_end[0]
+    tmp_recorded['progend'] = start_end[1]
 
     # Create the recordedpropgram dictionary
-    tmp_recordedprogram[u'chanid'] = channel_id
-    tmp_recordedprogram[u'starttime'] = start_end[0]
-    tmp_recordedprogram[u'endtime'] = start_end[1]
-    tmp_recordedprogram[u'title'] = item[u'channelTitle']
-    tmp_recordedprogram[u'subtitle'] = item[u'title']
+    tmp_recordedprogram['chanid'] = channel_id
+    tmp_recordedprogram['starttime'] = start_end[0]
+    tmp_recordedprogram['endtime'] = start_end[1]
+    tmp_recordedprogram['title'] = item['channelTitle']
+    tmp_recordedprogram['subtitle'] = item['title']
     try:
-        tmp_recordedprogram[u'description'] = massageDescription(item[u'description'])
+        tmp_recordedprogram['description'] = massageDescription(item['description'])
     except TypeError:
-        tmp_recordedprogram[u'description'] = item[u'description']
-
-    tmp_recordedprogram[u'category'] = u"Miro"
-    tmp_recordedprogram[u'category_type'] = u"series"
-    if item[u'releasedate'] is not None:
-        tmp_recordedprogram[u'airdate'] = item[u'releasedate'].strftime('%Y')
-        tmp_recordedprogram[u'originalairdate'] = item[u'releasedate'].strftime('%Y-%m-%d')
-    tmp_recordedprogram[u'stereo'] = ffmpeg_details[u'stereo']
-    tmp_recordedprogram[u'hdtv'] = ffmpeg_details[u'hdtv']
-    tmp_recordedprogram[u'audioprop'] = ffmpeg_details[u'audio']
-    tmp_recordedprogram[u'videoprop'] = ffmpeg_details[u'video']
+        tmp_recordedprogram['description'] = item['description']
+
+    tmp_recordedprogram['category'] = "Miro"
+    tmp_recordedprogram['category_type'] = "series"
+    if item['releasedate'] is not None:
+        tmp_recordedprogram['airdate'] = item['releasedate'].strftime('%Y')
+        tmp_recordedprogram['originalairdate'] = item['releasedate'].strftime('%Y-%m-%d')
+    tmp_recordedprogram['stereo'] = ffmpeg_details['stereo']
+    tmp_recordedprogram['hdtv'] = ffmpeg_details['hdtv']
+    tmp_recordedprogram['audioprop'] = ffmpeg_details['audio']
+    tmp_recordedprogram['videoprop'] = ffmpeg_details['video']
 
     return [tmp_recorded, tmp_recordedprogram,
-            createOldRecordedRecord(item, start_end[0], start_end[1], graphics[u'inetref'])]
+            createOldRecordedRecord(item, start_end[0], start_end[1], graphics['inetref'])]
     # end  createRecordedRecord()
 
 
@@ -1493,108 +1492,108 @@ def createVideometadataRecord(item):
     global vid_graphics_dirs, channel_icon_override, flat, image_extensions
     global local_only
 
-    ffmpeg_details = metadata.getVideoDetails(item[u'videoFilename'])
-    start_end = getStartEndTimes(ffmpeg_details[u'duration'], item[u'downloadedTime'])
+    ffmpeg_details = metadata.getVideoDetails(item['videoFilename'])
+    start_end = getStartEndTimes(ffmpeg_details['duration'], item['downloadedTime'])
 
-    sympath = u'Miro'
+    sympath = 'Miro'
     if not flat:
-        sympath+=u"/%s" % item[u'channelTitle']
+        sympath+="/%s" % item['channelTitle']
 
     # Get any graphics that already exist
-    graphics = metadata.getMetadata(sanitiseFileName(item[u'channelTitle']))
+    graphics = metadata.getMetadata(sanitiseFileName(item['channelTitle']))
 
     videometadata = {}
 
-    videometadata[u'title'] = item[u'channelTitle']
-    videometadata[u'subtitle'] = item[u'title']
-    videometadata[u'inetref'] = graphics[u'inetref']
-    videometadata[u'season'] = item[u'season']
-    videometadata[u'episode'] = item[u'episode']
+    videometadata['title'] = item['channelTitle']
+    videometadata['subtitle'] = item['title']
+    videometadata['inetref'] = graphics['inetref']
+    videometadata['season'] = item['season']
+    videometadata['episode'] = item['episode']
 
     try:
-        details = massageDescription(item[u'description'], extras=True)
+        details = massageDescription(item['description'], extras=True)
     except TypeError:
         print
-        print u"MythVideo-Channel title(%s) subtitle(%s)" % \
-                    (item[u'channelTitle'], item[u'title'])
-        print u"The 'massageDescription()' function could not remove HTML and XML tags from:"
-        print u"Description (%s)\n\n" % item[u'description']
-        details = {u'plot': item[u'description']}
+        print "MythVideo-Channel title(%s) subtitle(%s)" % \
+                    (item['channelTitle'], item['title'])
+        print "The 'massageDescription()' function could not remove HTML and XML tags from:"
+        print "Description (%s)\n\n" % item['description']
+        details = {'plot': item['description']}
 
     for key in details.keys():
         videometadata[key] = details[key]
 
-    if item[u'releasedate'] is None:
-        item[u'releasedate'] = item[u'downloadedTime']
+    if item['releasedate'] is None:
+        item['releasedate'] = item['downloadedTime']
     try:
-        dummy = item[u'releasedate'].strftime('%Y-%m-%d')
+        dummy = item['releasedate'].strftime('%Y-%m-%d')
     except ValueError:
-        item[u'releasedate'] = item[u'downloadedTime']
-
-    if item[u'releasedate'] is not None:
-        videometadata[u'year'] = item[u'releasedate'].strftime('%Y')
-        videometadata[u'releasedate'] = item[u'releasedate'].strftime('%Y-%m-%d')
-    videometadata[u'length'] = ffmpeg_details[u'duration']/60
-    if item.has_key(u'copied'):
-        videometadata[u'category'] = u'Video Cast'
+        item['releasedate'] = item['downloadedTime']
+
+    if item['releasedate'] is not None:
+        videometadata['year'] = item['releasedate'].strftime('%Y')
+        videometadata['releasedate'] = item['releasedate'].strftime('%Y-%m-%d')
+    videometadata['length'] = ffmpeg_details['duration']/60
+    if item.has_key('copied'):
+        videometadata['category'] = 'Video Cast'
     else:
-        videometadata[u'category'] = u'Miro'
+        videometadata['category'] = 'Miro'
 
-    if not item.has_key(u'copied'):
-        videofile = setSymbolic(item[u'videoFilename'], u'mythvideo', "%s/%s - %s" % \
-                            (sympath, sanitiseFileName(item[u'channelTitle']),
-                             sanitiseFileName(item[u'title'])), allow_symlink=True)
+    if not item.has_key('copied'):
+        videofile = setSymbolic(item['videoFilename'], 'mythvideo', "%s/%s - %s" % \
+                            (sympath, sanitiseFileName(item['channelTitle']),
+                             sanitiseFileName(item['title'])), allow_symlink=True)
         if videofile is not None:
-            videometadata[u'filename'] = videofile
-            if not local_only and videometadata[u'filename'][0] != u'/':
-                videometadata[u'host'] = localhostname.lower()
+            videometadata['filename'] = videofile
+            if not local_only and videometadata['filename'][0] != '/':
+                videometadata['host'] = localhostname.lower()
         else:
-            logger.critical(u"The file (%s) must exist to create a videometadata record" % \
-                                    item[u'videoFilename'])
+            logger.critical("The file (%s) must exist to create a videometadata record" % \
+                                    item['videoFilename'])
             sys.exit(1)
     else:
-        videometadata[u'filename'] = item[u'videoFilename']
-        if not local_only and videometadata[u'filename'][0] != u'/':
-            videometadata[u'host'] = localhostname.lower()
+        videometadata['filename'] = item['videoFilename']
+        if not local_only and videometadata['filename'][0] != '/':
+            videometadata['host'] = localhostname.lower()
 
-    videometadata[u'hash'] = hashFile(videometadata[u'filename'])
+    videometadata['hash'] = hashFile(videometadata['filename'])
 
-    if not item.has_key(u'copied'):
+    if not item.has_key('copied'):
         if graphics['coverart']:
-            videometadata[u'coverfile'] = graphics['coverart']
-        elif item[u'channel_icon'] and not item[u'channelTitle'].lower() in channel_icon_override:
-            filename = setSymbolic(item[u'channel_icon'], u'posterdir', u"%s" % \
-                                (sanitiseFileName(item[u'channelTitle'])))
+            videometadata['coverfile'] = graphics['coverart']
+        elif item['channel_icon'] and not item['channelTitle'].lower() in channel_icon_override:
+            filename = setSymbolic(item['channel_icon'], 'posterdir', "%s" % \
+                                (sanitiseFileName(item['channelTitle'])))
             if filename is not None:
-                videometadata[u'coverfile'] = filename
+                videometadata['coverfile'] = filename
         else:
-            if item[u'item_icon']:
-                filename = setSymbolic(item[u'item_icon'], u'posterdir', u"%s - %s" % \
-                                        (sanitiseFileName(item[u'channelTitle']),
-                                         sanitiseFileName(item[u'title'])))
+            if item['item_icon']:
+                filename = setSymbolic(item['item_icon'], 'posterdir', "%s - %s" % \
+                                        (sanitiseFileName(item['channelTitle']),
+                                         sanitiseFileName(item['title'])))
                 if filename is not None:
-                    videometadata[u'coverfile'] = filename
+                    videometadata['coverfile'] = filename
     else:
-        videometadata[u'coverfile'] = item[u'channel_icon']
+        videometadata['coverfile'] = item['channel_icon']
 
-    if not item.has_key(u'copied'):
-        if item[u'screenshot']:
-            filename = setSymbolic(item[u'screenshot'], u'episodeimagedir', u"%s - %s" % \
-                                        (sanitiseFileName(item[u'channelTitle']),
-                                         sanitiseFileName(item[u'title'])))
+    if not item.has_key('copied'):
+        if item['screenshot']:
+            filename = setSymbolic(item['screenshot'], 'episodeimagedir', "%s - %s" % \
+                                        (sanitiseFileName(item['channelTitle']),
+                                         sanitiseFileName(item['title'])))
             if filename is not None:
-                videometadata[u'screenshot'] = filename
+                videometadata['screenshot'] = filename
     else:
-        if item[u'screenshot']:
-            videometadata[u'screenshot'] = item[u'screenshot']
+        if item['screenshot']:
+            videometadata['screenshot'] = item['screenshot']
 
     if graphics['banner']:
-        videometadata[u'banner'] = graphics['banner']
+        videometadata['banner'] = graphics['banner']
     if graphics['fanart']:
-        videometadata[u'fanart'] = graphics['fanart']
+        videometadata['fanart'] = graphics['fanart']
 
     return [videometadata, createOldRecordedRecord(item, start_end[0], start_end[1],
-            graphics[u'inetref'])]
+            graphics['inetref'])]
     # end createVideometadataRecord()
 
 
@@ -1606,12 +1605,12 @@ def createChannelRecord(icon, channel_id, channel_num):
     '''
     global localhostname, simulation, verbose, vid_graphics_dirs
 
-    if icon != u"":
+    if icon != "":
         if not os.path.isfile(icon):
-            logger.critical((u'The Miro channel icon file (%s) does not exist.\nThe variable '\
-                             u'needs to be a fully qualified file name and path.\ne.g. '\
-                             u'./mirobridge.py -C "/path to the channel icon/miro_channel_icon.'\
-                             u'jpg"') % (icon))
+            logger.critical(('The Miro channel icon file (%s) does not exist.\nThe variable '\
+                             'needs to be a fully qualified file name and path.\ne.g. '\
+                             './mirobridge.py -C "/path to the channel icon/miro_channel_icon.'\
+                             'jpg"') % (icon))
             sys.exit(1)
 
     data={}
@@ -1619,25 +1618,25 @@ def createChannelRecord(icon, channel_id, channel_num):
     data['channum'] = str(channel_num)
     data['freqid'] = str(channel_num)
     data['atsc_major_chan'] = int(channel_num)
-    data['icon'] = u''
-    if icon != u'':
+    data['icon'] = ''
+    if icon != '':
         data['icon'] = icon
-    data['callsign'] = u'Miro'
-    data['name'] = u'Miro'
+    data['callsign'] = 'Miro'
+    data['name'] = 'Miro'
     data['last_record'] = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
     if simulation:
-        logger.info(u"Simulation: Create Miro channel record channel_id(%d) and channel_num(%d)" % \
+        logger.info("Simulation: Create Miro channel record channel_id(%d) and channel_num(%d)" % \
                             (channel_id, channel_num))
-        logger.info(u"Simulation: Channel icon file(%s)" % (icon))
+        logger.info("Simulation: Channel icon file(%s)" % (icon))
     else:
         try:
             Channel().create(data)
         except MythError, e:
-            logger.critical((u"Failed writing the Miro channel record. Most likely the Channel "\
-                             u"Id and number already exists.\nUse MythTV set up program "\
-                             u"(mythtv-setup) to alter or remove the offending channel.\nYou "\
-                             u"specified Channel ID (%d) and Channel Number (%d), error(%s)") % \
+            logger.critical(("Failed writing the Miro channel record. Most likely the Channel "\
+                             "Id and number already exists.\nUse MythTV set up program "\
+                             "(mythtv-setup) to alter or remove the offending channel.\nYou "\
+                             "specified Channel ID (%d) and Channel Number (%d), error(%s)") % \
                                         (channel_id, channel_num, e.args[0]))
             sys.exit(1)
     return True
@@ -1655,9 +1654,9 @@ def checkVideometadataFails(record, flat):
     for field in key_trans.keys():
         if not record[field]:
             continue
-        if record[field] == u'No Cover':
+        if record[field] == 'No Cover':
             continue
-        if not record[u'host'] or record[field][0] == u'/':
+        if not record['host'] or record[field][0] == '/':
             if not os.path.isfile(record[field]):
                 return True
         else:
@@ -1675,23 +1674,23 @@ def createMiroMythVideoDirectory():
 
     # Check that a MIRO video directory exists
     # if not then create the dir and add symbolic link to cover/file or icon
-    miro = u'Miro'
-    miro_path = vid_graphics_dirs[u'mythvideo']+miro
+    miro = 'Miro'
+    miro_path = vid_graphics_dirs['mythvideo']+miro
     if not os.path.isdir(miro_path):
         try:
             if simulation:
-                logger.info(u"Simulation: Create Miro Mythvideo directory (%s)" % (miro_path,))
+                logger.info("Simulation: Create Miro Mythvideo directory (%s)" % (miro_path,))
             else:
                 try:
                     os.mkdir(miro_path)
                 except OSError, e:
-                    logger.critical((u"Create Miro Mythvideo directory (%s).\nError(%s)\n" \
-                                     u"This may be due to a permissions error.") % \
+                    logger.critical(("Create Miro Mythvideo directory (%s).\nError(%s)\n" \
+                                     "This may be due to a permissions error.") % \
                                             (miro_path, e))
                     sys.exit(1)
         except OSError, e:
-            logger.critical((u"Creation of MythVideo 'Miro' directory (%s) failed.\nError(%s)"\
-                             u"\nThis may be due to a permissions error.") % (miro_path, e))
+            logger.critical(("Creation of MythVideo 'Miro' directory (%s) failed.\nError(%s)"\
+                             "\nThis may be due to a permissions error.") % (miro_path, e))
             sys.exit(1)
     # end createMiroMythVideoDirectory()
 
@@ -1701,19 +1700,19 @@ def createMiroChannelSubdirectory(item):
     '''
     global localhostname, vid_graphics_dirs, storagegroups, channel_id, flat, simulation, verbose
 
-    miro = u'Miro'
-    path = u"%s%s/%s" % (vid_graphics_dirs[u'mythvideo'], miro,
-                         sanitiseFileName(item[u'channelTitle']))
+    miro = 'Miro'
+    path = "%s%s/%s" % (vid_graphics_dirs['mythvideo'], miro,
+                         sanitiseFileName(item['channelTitle']))
 
     if simulation:
-        logger.info(u"Simulation: Make subdirectory(%s)" % (path))
+        logger.info("Simulation: Make subdirectory(%s)" % (path))
     else:
         if not os.path.isdir(path):
             try:
                 os.mkdir(path)
             except OSError, e:
-                logger.critical((u"Creation of MythVideo 'Miro' subdirectory path (%s) failed."\
-                                 u"\nError(%s)\nThis may be due to a permissions error.") % \
+                logger.critical(("Creation of MythVideo 'Miro' subdirectory path (%s) failed."\
+                                 "\nError(%s)\nThis may be due to a permissions error.") % \
                                         (path, e))
                 sys.exit(1)
     # end createMiroChannelSubdirectory()
@@ -1731,17 +1730,17 @@ def getPlayedMiroVideos():
     for record in recorded:
         # Skip if the video has NOT been watched or has been marked for
         # deletion
-        if record[u'watched'] == 0 or record['autoexpire'] == 9999:
+        if record['watched'] == 0 or record['autoexpire'] == 9999:
             continue
         try:
-            filenames.append(os.path.realpath(storagegroups[u'default']+record[u'basename']))
-            statistics[u'WR_watched']+=1
+            filenames.append(os.path.realpath(storagegroups['default']+record['basename']))
+            statistics['WR_watched']+=1
         except OSError, e:
-            logger.info(u"Miro video file has been removed (%s) outside of mirobridge\nError(%s)" % \
-                                (storagegroups[u'default']+record[u'basename'], e))
+            logger.info("Miro video file has been removed (%s) outside of mirobridge\nError(%s)" % \
+                                (storagegroups['default']+record['basename'], e))
             continue
-        displayMessage(u"Miro video (%s) (%s) has been marked as watched in MythTV." % \
-                                (record[u'title'], record[u'subtitle']))
+        displayMessage("Miro video (%s) (%s) has been marked as watched in MythTV." % \
+                                (record['title'], record['subtitle']))
     if len(filenames):
         return filenames
     else:
@@ -1765,28 +1764,28 @@ def updateMythRecorded(items):
     # Deal with existing Miro videos already in the MythTV data base
     recorded = list(mythdb.searchRecorded(chanid=channel_id, hostname=localhostname))
     for record in recorded:
-        if storagegroups.has_key(u'default'):
-            sym_filepath = u"%s%s" % (storagegroups[u'default'], record[u'basename'])
+        if storagegroups.has_key('default'):
+            sym_filepath = "%s%s" % (storagegroups['default'], record['basename'])
         else:
-            sym_filepath = u"%s%s" % (vid_graphics_dirs[u'default'], record[u'basename'])
+            sym_filepath = "%s%s" % (vid_graphics_dirs['default'], record['basename'])
         # Remove any videos that were marked as viewed within Miro but NOT MythTV
         remove = False
         for item in items:
-            if item[u'channelTitle'] == record[u'title'] and item[u'title'] == record[u'subtitle']:
+            if item['channelTitle'] == record['title'] and item['title'] == record['subtitle']:
                 break
         else:
             remove = True
         # Remove any Miro related "watched" recordings (symlink, recorded records)
         # Or remove any Miro related with broken symbolic video links
-        if record[u'watched'] == 1 or not os.path.isfile(os.path.realpath(sym_filepath)):
+        if record['watched'] == 1 or not os.path.isfile(os.path.realpath(sym_filepath)):
             remove = True
         if remove:
-            displayMessage(u"Removing watched Miro recording (%s) (%s)" % \
-                                    (record[u'title'], record[u'subtitle']))
+            displayMessage("Removing watched Miro recording (%s) (%s)" % \
+                                    (record['title'], record['subtitle']))
             # Remove the database recorded and oldrecorded records
             if simulation:
-                logger.info(u"Simulation: Remove recorded/recordedprogram/oldrecorded records and "\
-                            u"associated Miro Video file for chanid(%s), starttime(%s)" % \
+                logger.info("Simulation: Remove recorded/recordedprogram/oldrecorded records and "\
+                            "associated Miro Video file for chanid(%s), starttime(%s)" % \
                                     (record['chanid'], record['starttime']))
             else:
                 try:
@@ -1797,9 +1796,9 @@ def updateMythRecorded(items):
                     pass
 
                 # Clean up for recorded video files and/or graphics
-                metadata.cleanupVideoAndGraphics(u'%s%s_%s.%s' % \
-                            (vid_graphics_dirs[u'default'], record['chanid'],
-                             record[u'starttime'].strftime('%Y%m%d%H%M%S'), u'png'))
+                metadata.cleanupVideoAndGraphics('%s%s_%s.%s' % \
+                            (vid_graphics_dirs['default'], record['chanid'],
+                             record['starttime'].strftime('%Y%m%d%H%M%S'), 'png'))
 
                 try: # Attempting to clean up an orphaned oldrecorded record which may or may not exist
                     rtn = delOldRecorded(record['chanid'], record['starttime'],
@@ -1811,101 +1810,101 @@ def updateMythRecorded(items):
     recorded = list(mythdb.searchRecorded(chanid=channel_id, hostname=localhostname))
     for record in recorded:    # Skip any item already in MythTV data base
         for item in items:
-            if item[u'channelTitle'] == record[u'title'] and item[u'title'] == record[u'subtitle']:
+            if item['channelTitle'] == record['title'] and item['title'] == record['subtitle']:
                 items_copy.remove(item)
                 break
 
     # Add new Miro unwatched videos to MythTV'd data base
     for item in items_copy:
         # Do not create records for Miro video files when Miro has a corrupt or missing file name
-        if item[u'videoFilename'] is None:
+        if item['videoFilename'] is None:
             continue
         # Do not create records for Miro video files that do not exist
-        if not os.path.isfile(os.path.realpath(item[u'videoFilename'])):
+        if not os.path.isfile(os.path.realpath(item['videoFilename'])):
             continue
-        if not os.path.isfile(os.path.realpath(item[u'videoFilename'])):
+        if not os.path.isfile(os.path.realpath(item['videoFilename'])):
             continue # Do not create records for Miro video files that do not exist
         records = createRecordedRecords(item)
         if records:
             if simulation:
-                logger.info(u"Simulation: Added recorded and recordedprogram records for "\
-                            u"(%s - %s)" % (item[u'channelTitle'], item[u'title'],))
+                logger.info("Simulation: Added recorded and recordedprogram records for "\
+                            "(%s - %s)" % (item['channelTitle'], item['title'],))
             else:
                 try:
                     Recorded().create(records[0])
                     RecordedProgram().create(records[1])
                     OldRecorded().create(records[2])
                 except MythError, e:
-                    logger.warning(u"Inserting recorded/recordedprogram/oldrecorded records "\
-                                   u"non-critical error (%s) for (%s - %s)" % \
-                                            (e.args[0], item[u'channelTitle'], item[u'title']))
+                    logger.warning("Inserting recorded/recordedprogram/oldrecorded records "\
+                                   "non-critical error (%s) for (%s - %s)" % \
+                                            (e.args[0], item['channelTitle'], item['title']))
         else:
-            logger.critical(u"Creation of recorded/recordedprogram/oldrecorded record data for "\
-                            u"(%s - %s)" % (item[u'channelTitle'], item[u'title'],))
+            logger.critical("Creation of recorded/recordedprogram/oldrecorded record data for "\
+                            "(%s - %s)" % (item['channelTitle'], item['title'],))
             sys.exit(1)
 
-        if item[u'channel_icon']: # Add Cover art link to channel icon
-            ext = getExtention(item[u'channel_icon'])
-            coverart_filename = u"%s%s%s.%s" % (vid_graphics_dirs[u'posterdir'],
-                                                sanitiseFileName(item[u'channelTitle']),
-                                                graphic_suffix[u'posterdir'], ext)
+        if item['channel_icon']: # Add Cover art link to channel icon
+            ext = getExtention(item['channel_icon'])
+            coverart_filename = "%s%s%s.%s" % (vid_graphics_dirs['posterdir'],
+                                                sanitiseFileName(item['channelTitle']),
+                                                graphic_suffix['posterdir'], ext)
             if not os.path.isfile(os.path.realpath(coverart_filename)): # Make sure it does not exist
                 if simulation:
-                    logger.info(u"Simulation: Remove symbolic link(%s)" % (coverart_filename,))
+                    logger.info("Simulation: Remove symbolic link(%s)" % (coverart_filename,))
                 else:
                     try:    # Clean up broken symbolic link
                         os.remove(coverart_filename)
                     except OSError:
                         pass
                 if simulation:
-                    logger.info(u"Simulation: Create icon file(%s) cover art file(%s)" % \
-                                        (item[u'channel_icon'], coverart_filename))
+                    logger.info("Simulation: Create icon file(%s) cover art file(%s)" % \
+                                        (item['channel_icon'], coverart_filename))
                 else:
                     try:
-                        shutil.copy2(item[u'channel_icon'], coverart_filename)
-                        displayMessage((u"Copied a Miro Channel Icon file (%s) to MythTV as "\
-                                        u"file (%s).") % (item[u'channel_icon'], coverart_filename))
+                        shutil.copy2(item['channel_icon'], coverart_filename)
+                        displayMessage(("Copied a Miro Channel Icon file (%s) to MythTV as "\
+                                        "file (%s).") % (item['channel_icon'], coverart_filename))
                     except OSError, e:
-                        logger.critical((u"Copying an icon file(%s) to coverart file(%s) failed."\
-                                         u"\nError(%s)\nThis may be due to a permissions error.") % \
-                                                 (item[u'channel_icon'], coverart_filename, e))
+                        logger.critical(("Copying an icon file(%s) to coverart file(%s) failed."\
+                                         "\nError(%s)\nThis may be due to a permissions error.") % \
+                                                 (item['channel_icon'], coverart_filename, e))
                         sys.exit(1)
 
-        if item[u'screenshot'] and imagemagick: # Add Miro screen shot to 'Default' recordings directory
-            screenshot_recorded = u"%s%s.png" % (vid_graphics_dirs[u'default'], records[0][u'basename'])
+        if item['screenshot'] and imagemagick: # Add Miro screen shot to 'Default' recordings directory
+            screenshot_recorded = "%s%s.png" % (vid_graphics_dirs['default'], records[0]['basename'])
             if not os.path.isfile(screenshot_recorded): # Make sure it does not exist
                 if simulation:
-                    logger.info(u"Simulation: Create screenshot file(%s) as(%s)" % \
-                                        (item[u'screenshot'], screenshot_recorded))
+                    logger.info("Simulation: Create screenshot file(%s) as(%s)" % \
+                                        (item['screenshot'], screenshot_recorded))
                 else:
                     try:
-                        demensions = u''
+                        demensions = ''
                         try:
-                            demensions = takeScreenShot(item[u'videoFilename'],
+                            demensions = takeScreenShot(item['videoFilename'],
                                                         screenshot_recorded,
                                                         size_limit=True,
                                                         just_demensions=False)
                         except:
                             pass
                         if demensions:
-                            demensions = u"-size %s" % demensions
-                        useImageMagick(u'convert "%s" %s "%s"' % \
-                                            (item[u'screenshot'], demensions,
+                            demensions = "-size %s" % demensions
+                        useImageMagick('convert "%s" %s "%s"' % \
+                                            (item['screenshot'], demensions,
                                              screenshot_recorded))
-                        displayMessage((u"Used a Miro Channel screenshot file (%s) to\ncreate "\
-                                        u"using ImageMagick the MythTV Watch Recordings screen "\
-                                        u"shot file\n(%s).") % \
-                                                (item[u'screenshot'], screenshot_recorded))
+                        displayMessage(("Used a Miro Channel screenshot file (%s) to\ncreate "\
+                                        "using ImageMagick the MythTV Watch Recordings screen "\
+                                        "shot file\n(%s).") % \
+                                                (item['screenshot'], screenshot_recorded))
                     except OSError, e:
-                        logger.critical((u"Creating screenshot file(%s) as(%s) failed.\nError"\
-                                         u"(%s)\nThis may be due to a permissions error.") % \
-                                                (item[u'screenshot'], screenshot_recorded, e))
+                        logger.critical(("Creating screenshot file(%s) as(%s) failed.\nError"\
+                                         "(%s)\nThis may be due to a permissions error.") % \
+                                                (item['screenshot'], screenshot_recorded, e))
                         sys.exit(1)
         else:
-            screenshot_recorded = u"%s%s.png" % \
-                                        (vid_graphics_dirs[u'default'], records[0][u'basename'])
+            screenshot_recorded = "%s%s.png" % \
+                                        (vid_graphics_dirs['default'], records[0]['basename'])
             try:
-                takeScreenShot(item[u'videoFilename'], screenshot_recorded, size_limit=True)
+                takeScreenShot(item['videoFilename'], screenshot_recorded, size_limit=True)
             except:
                 pass
 
@@ -1931,40 +1930,40 @@ def updateMythVideo(items):
     createMiroMythVideoDirectory()
 
     # Remove any Miro Mythvideo records which the video or graphics paths are broken
-    records = list(mythdb.searchVideos(category=u'Miro'))
-    statistics[u'Total_Miro_MythVideos'] = len(records)
+    records = list(mythdb.searchVideos(category='Miro'))
+    statistics['Total_Miro_MythVideos'] = len(records)
     for record in records: # Count the Miro-MythVideos that Miro is expiring or has saved
-        if record[u'filename'][0] == u'/':
-            if os.path.islink(record[u'filename']) and os.path.isfile(record[u'filename']):
-                statistics[u'Total_Miro_expiring']+=1
-        elif record[u'host'] and storagegroups.has_key(u'mythvideo'):
-            if os.path.islink(storagegroups[u'mythvideo']+record[u'filename']) and \
-                        os.path.isfile(storagegroups[u'mythvideo']+record[u'filename']):
-                statistics[u'Total_Miro_expiring']+=1
+        if record['filename'][0] == '/':
+            if os.path.islink(record['filename']) and os.path.isfile(record['filename']):
+                statistics['Total_Miro_expiring']+=1
+        elif record['host'] and storagegroups.has_key('mythvideo'):
+            if os.path.islink(storagegroups['mythvideo']+record['filename']) and \
+                        os.path.isfile(storagegroups['mythvideo']+record['filename']):
+                statistics['Total_Miro_expiring']+=1
     for record in records:
         if checkVideometadataFails(record, flat):
             delete = False
-            if os.path.islink(record[u'filename']): # Only delete video files if they are symlinks
-                if not record[u'host'] or record[u'filename'][0] == '/':
-                    if not os.path.isfile(record[u'filename']):
+            if os.path.islink(record['filename']): # Only delete video files if they are symlinks
+                if not record['host'] or record['filename'][0] == '/':
+                    if not os.path.isfile(record['filename']):
                         delete = True
                 else:
-                    if not os.path.isfile(vid_graphics_dirs[key_trans[field]]+record[u'filename']):
+                    if not os.path.isfile(vid_graphics_dirs[key_trans[field]]+record['filename']):
                         delete = True
             else:
-                if not os.path.isfile(record[u'filename']):
+                if not os.path.isfile(record['filename']):
                     delete = True
             if delete: # Only delete video files if they are symlinks
                 if simulation:
-                    logger.info(u"Simulation: DELETE videometadata for intid = %s" % \
-                                        (record[u'intid'],))
-                    logger.info(u"Simulation: DELETE oldrecorded for title(%s), subtitle(%s)" % \
-                                        (record[u'title'], record[u'subtitle']))
+                    logger.info("Simulation: DELETE videometadata for intid = %s" % \
+                                        (record['intid'],))
+                    logger.info("Simulation: DELETE oldrecorded for title(%s), subtitle(%s)" % \
+                                        (record['title'], record['subtitle']))
                 else:
-                    rtn = Video(record[u'intid'], db=mythdb).delete()
+                    rtn = Video(record['intid'], db=mythdb).delete()
                     try: # An orphaned oldrecorded record may not exist
-                        for oldrecorded in mythdb.searchOldRecorded(title=record[u'title'],
-                                                                    subtitle=record[u'subtitle'] ):
+                        for oldrecorded in mythdb.searchOldRecorded(title=record['title'],
+                                                                    subtitle=record['subtitle'] ):
                             rtn = delOldRecorded(channel_id,
                                                 oldrecorded['starttime'],
                                                 oldrecorded['endtime'],
@@ -1973,35 +1972,35 @@ def updateMythVideo(items):
                                                 oldrecorded['description'])
                     except Exception, e:
                         pass
-                statistics[u'Total_Miro_MythVideos']-=1
+                statistics['Total_Miro_MythVideos']-=1
                 # Remove video file
-                metadata.deleteFile(record[u'filename'], record[u'host'], u'mythvideo')
-            if record[u'screenshot']: # Remove any associated Screenshot
-                metadata.deleteFile(record[u'screenshot'], record[u'host'], u'episodeimagedir')
+                metadata.deleteFile(record['filename'], record['host'], 'mythvideo')
+            if record['screenshot']: # Remove any associated Screenshot
+                metadata.deleteFile(record['screenshot'], record['host'], 'episodeimagedir')
             # Remove any unique cover art graphic files
-            if record[u'title'].lower() in channel_icon_override:
-                metadata.deleteFile(record[u'coverfile'], record[u'host'], u'posterdir')
+            if record['title'].lower() in channel_icon_override:
+                metadata.deleteFile(record['coverfile'], record['host'], 'posterdir')
 
     if not items: # There may not be any new items to add to MythVideo
         return True
     # Reread Miro Mythvideo videometadata records
     # Remove the matching videometadata record from array of items
     items_copy = list(items)
-    records = list(mythdb.searchVideos(category=u'Miro'))
+    records = list(mythdb.searchVideos(category='Miro'))
     for record in records:
         for item in items:
-            if item[u'channelTitle'] == record[u'title'] and item[u'title'] == record[u'subtitle']:
+            if item['channelTitle'] == record['title'] and item['title'] == record['subtitle']:
                 try:
                     items_copy.remove(item)
                 except ValueError:
-                    logger.info((u"Video (%s - %s) was found multiple times in list of (watched "\
-                                 u"and/or saved) items from Miro - skipping") % \
-                                        (item[u'channelTitle'], item[u'title']))
+                    logger.info(("Video (%s - %s) was found multiple times in list of (watched "\
+                                 "and/or saved) items from Miro - skipping") % \
+                                        (item['channelTitle'], item['title']))
                     pass
                 break
 
     for item in items: # Remove any items that are for a Channel that does not get MythVideo records
-        if filter(is_not_punct_char, item[u'channelTitle'].lower()) in channel_watch_only:
+        if filter(is_not_punct_char, item['channelTitle'].lower()) in channel_watch_only:
             try:    # Some items may have already been removed, let those passed
                 items_copy.remove(item)
             except ValueError:
@@ -2009,64 +2008,64 @@ def updateMythVideo(items):
     # Add Miro videos that remain in the item list
     # If not a flat directory check if title directory exists and add icon symbolic link as coverfile
     for item in items_copy:
-        if not flat and not item.has_key(u'copied'):
+        if not flat and not item.has_key('copied'):
             createMiroChannelSubdirectory(item)
-        if not item[u'screenshot']: # If there is no screen shot then create one
-            screenshot_mythvideo = u"%s%s - %s%s.jpg" % \
-                            (vid_graphics_dirs[u'episodeimagedir'],
-                             sanitiseFileName(item[u'channelTitle']),
-                             sanitiseFileName(item[u'title']),
-                             graphic_suffix[u'episodeimagedir'])
+        if not item['screenshot']: # If there is no screen shot then create one
+            screenshot_mythvideo = "%s%s - %s%s.jpg" % \
+                            (vid_graphics_dirs['episodeimagedir'],
+                             sanitiseFileName(item['channelTitle']),
+                             sanitiseFileName(item['title']),
+                             graphic_suffix['episodeimagedir'])
             try:
-                result = takeScreenShot(item[u'videoFilename'], screenshot_mythvideo, size_limit=False)
+                result = takeScreenShot(item['videoFilename'], screenshot_mythvideo, size_limit=False)
             except:
                 result = None
             if result is not None:
-                item[u'screenshot'] = screenshot_mythvideo
+                item['screenshot'] = screenshot_mythvideo
         tmp_array = createVideometadataRecord(item)
         videometadata = tmp_array[0]
         oldrecorded = tmp_array[1]
         if simulation:
-            logger.info(u"Simulation: Create videometadata record for (%s - %s)" % \
-                                            (item[u'channelTitle'], item[u'title']))
+            logger.info("Simulation: Create videometadata record for (%s - %s)" % \
+                                            (item['channelTitle'], item['title']))
         else:  # Check for duplicates
-            if not local_only and videometadata[u'filename'][0] != u'/':
-                intid = list(mythdb.searchVideos(exactfile=videometadata[u'filename'],
+            if not local_only and videometadata['filename'][0] != '/':
+                intid = list(mythdb.searchVideos(exactfile=videometadata['filename'],
                                                  host=localhostname.lower()))
             else:
-                intid = list(mythdb.searchVideos(exactfile=videometadata[u'filename']))
+                intid = list(mythdb.searchVideos(exactfile=videometadata['filename']))
 
             if intid == []: # Check for an empty array
                 try:
                     intid = Video(db=mythdb).create(videometadata).intid
                 except MythError, e:
-                    logger.critical(u"Adding Miro video to MythVideo (%s - %s) failed for (%s)." % \
-                                            (item[u'channelTitle'], item[u'title'], e.args[0]))
+                    logger.critical("Adding Miro video to MythVideo (%s - %s) failed for (%s)." % \
+                                            (item['channelTitle'], item['title'], e.args[0]))
                     sys.exit(1)
-                if not item.has_key(u'copied'):
+                if not item.has_key('copied'):
                     try:
                         OldRecorded().create(oldrecorded)
                     except MythError, e:
-                        logger.critical(u"Failed writing the oldrecorded record for(%s)" % (e.args[0]))
+                        logger.critical("Failed writing the oldrecorded record for(%s)" % (e.args[0]))
                         sys.exit(1)
-                if videometadata[u'filename'][0] == u'/':
-                    cmd = mythcommflag_videos % videometadata[u'filename']
-                elif videometadata[u'host'] and storagegroups[u'mythvideo']:
+                if videometadata['filename'][0] == '/':
+                    cmd = mythcommflag_videos % videometadata['filename']
+                elif videometadata['host'] and storagegroups['mythvideo']:
                     cmd = mythcommflag_videos % \
-                                ((storagegroups[u'mythvideo']+videometadata[u'filename']))
-                statistics[u'Miros_MythVideos_added']+=1
-                statistics[u'Total_Miro_expiring']+=1
-                statistics[u'Total_Miro_MythVideos']+=1
-                displayMessage(u"Added Miro video to MythVideo (%s - %s)" % \
-                                        (videometadata[u'title'], videometadata[u'subtitle']))
+                                (storagegroups['mythvideo']+videometadata['filename'])
+                statistics['Miros_MythVideos_added']+=1
+                statistics['Total_Miro_expiring']+=1
+                statistics['Total_Miro_MythVideos']+=1
+                displayMessage("Added Miro video to MythVideo (%s - %s)" % \
+                                        (videometadata['title'], videometadata['subtitle']))
             else:
-                sys.stdout.write(u'')
+                sys.stdout.write('')
                 displayMessage(\
-u"""Skipped adding a duplicate Miro video to MythVideo:
+"""Skipped adding a duplicate Miro video to MythVideo:
 (%s - %s)
 Sometimes a Miro channel has the same video downloaded multiple times.
 This is a Miro/Channel web site issue and often rectifies itself overtime.
-""" % (videometadata[u'title'], videometadata[u'subtitle']))
+""" % (videometadata['title'], videometadata['subtitle']))
 
     return True
     # end updateMythVideo()
@@ -2075,7 +2074,7 @@ def printStatistics():
     global statistics
 
     # Print statistics
-    sys.stdout.write(u"""
+    sys.stdout.write("""
 
 -------------------Statistics--------------------
 Number of Watch Recording's watched...... (% 5d)
@@ -2091,11 +2090,11 @@ def printStatistics():
 Total Miro/MythVideo videos.............. (% 5d)
 -------------------------------------------------
 
-""" % (statistics[u'WR_watched'],  statistics[u'Miro_marked_watch_seen'],
-       statistics[u'Miro_videos_deleted'], statistics[u'Miros_videos_downloaded'],
-       statistics[u'Miros_MythVideos_video_removed'], statistics[u'Miros_MythVideos_added'],
-       statistics[u'Miros_MythVideos_copied'], statistics[u'Total_unwatched'],
-       statistics[u'Total_Miro_expiring'], statistics[u'Total_Miro_MythVideos'], ))
+""" % (statistics['WR_watched'],  statistics['Miro_marked_watch_seen'],
+       statistics['Miro_videos_deleted'], statistics['Miros_videos_downloaded'],
+       statistics['Miros_MythVideos_video_removed'], statistics['Miros_MythVideos_added'],
+       statistics['Miros_MythVideos_copied'], statistics['Total_unwatched'],
+       statistics['Total_Miro_expiring'], statistics['Total_Miro_MythVideos'], ))
     # end printStatistics()
 
 
@@ -2117,7 +2116,7 @@ def main():
         sys.exit(0)
 
     if opts.version:        # Display program information
-        sys.stdout.write(u"\nTitle: (%s); Version: description(%s); Author: (%s)\n%s\n" % (
+        sys.stdout.write("\nTitle: (%s); Version: description(%s); Author: (%s)\n%s\n" % (
         __title__, __version__, __author__, __purpose__ ))
         sys.exit(0)
 
@@ -2137,8 +2136,8 @@ def main():
     if opts.mythvideo_only: x+=1
     if opts.import_opml: x+=1
     if x > 1:
-        logger.critical(u"The (-W), (-M), (-N) and (-i) options are mutually exclusive, "\
-                        u"so only one can be specified at a time.")
+        logger.critical("The (-W), (-M), (-N) and (-i) options are mutually exclusive, "\
+                        "so only one can be specified at a time.")
         sys.exit(1)
 
     # Set option related global variables
@@ -2151,33 +2150,33 @@ def main():
 
     ## Video base directory and current version and revision numbers
     base_video_dir = miroConfiguration(prefs.MOVIES_DIRECTORY)
-    miro_version_rev = u"%s r%s" % (miroConfiguration(prefs.APP_VERSION),
+    miro_version_rev = "%s r%s" % (miroConfiguration(prefs.APP_VERSION),
                                     miroConfiguration(prefs.APP_REVISION_NUM))
 
-    displayMessage(u"Miro Version (%s)" % (miro_version_rev))
-    displayMessage(u"Base Miro Video Directory (%s)" % (base_video_dir,))
-    logger.info(u'')
+    displayMessage("Miro Version (%s)" % (miro_version_rev))
+    displayMessage("Base Miro Video Directory (%s)" % (base_video_dir,))
+    logger.info('')
 
     # Verify Miro version sufficent and Video file configuration correct.
     if not os.path.isdir(base_video_dir):
-        logger.critical(u"The Miro Videos directory (%s) does not exist." % str(base_video_dir))
+        logger.critical("The Miro Videos directory (%s) does not exist." % str(base_video_dir))
         if test_environment:
             requirements_are_met = False
         else:
             sys.exit(1)
 
-    if miroConfiguration(prefs.APP_VERSION) < u"2.0.3":
-        logger.critical((u"The installed version of Miro (%s) is too old. It must be at least "\
-                         u"v2.0.3 or higher.") % miroConfiguration(prefs.APP_VERSION))
+    if miroConfiguration(prefs.APP_VERSION) < "2.0.3":
+        logger.critical(("The installed version of Miro (%s) is too old. It must be at least "\
+                         "v2.0.3 or higher.") % miroConfiguration(prefs.APP_VERSION))
         if test_environment:
             requirements_are_met = False
         else:
             sys.exit(1)
 
     # Miro 4.0.1 has a critical bug that effects MiroBridge. Miro must be upgraded.
-    if miroConfiguration(prefs.APP_VERSION) == u"4.0.1":
-        logger.critical((u"The installed version of Miro (%s) must be upgraded to Miro version "\
-                         u"4.0.2 or higher.") % miroConfiguration(prefs.APP_VERSION))
+    if miroConfiguration(prefs.APP_VERSION) == "4.0.1":
+        logger.critical(("The installed version of Miro (%s) must be upgraded to Miro version "\
+                         "4.0.2 or higher.") % miroConfiguration(prefs.APP_VERSION))
         if test_environment:
             requirements_are_met = False
         else:
@@ -2185,29 +2184,29 @@ def main():
 
     # Verify that the import opml option can be used
     if opts.import_opml:
-        if miroConfiguration(prefs.APP_VERSION) < u"2.5.2":
-            logger.critical(u"The OPML import option requires Miro v2.5.2 or higher your Miro "\
-                            u"(%s) is too old." % miroConfiguration(prefs.APP_VERSION))
+        if miroConfiguration(prefs.APP_VERSION) < "2.5.2":
+            logger.critical("The OPML import option requires Miro v2.5.2 or higher your Miro "\
+                            "(%s) is too old." % miroConfiguration(prefs.APP_VERSION))
             if test_environment:
                 requirements_are_met = False
             else:
                 sys.exit(1)
         if not os.path.isfile(opts.import_opml):
-            logger.critical(u"The OPML import file (%s) does not exist" % opts.import_opml)
+            logger.critical("The OPML import file (%s) does not exist" % opts.import_opml)
             if test_environment:
                 requirements_are_met = False
             else:
                 sys.exit(1)
         if len(opts.import_opml) > 5:
             if not opts.import_opml[:-4] != '.opml':
-                logger.critical(u"The OPML import file (%s) must had a file extention of '.opml'" % \
+                logger.critical("The OPML import file (%s) must had a file extention of '.opml'" % \
                                         opts.import_opml)
                 if test_environment:
                     requirements_are_met = False
                 else:
                     sys.exit(1)
         else:
-            logger.critical(u"The OPML import file (%s) must had a file extention of '.opml'" % \
+            logger.critical("The OPML import file (%s) must had a file extention of '.opml'" % \
                                         opts.import_opml)
             if test_environment:
                 requirements_are_met = False
@@ -2216,29 +2215,29 @@ def main():
 
     # Get storage groups
     if getStorageGroups() == False:
-        logger.critical(u"Retrieving storage groups from the MythTV data base failed")
+        logger.critical("Retrieving storage groups from the MythTV data base failed")
         if test_environment:
             requirements_are_met = False
         else:
             sys.exit(1)
-    elif not u'default' in storagegroups.keys():
-        logger.critical(u"There must be a 'Default' storage group")
+    elif not 'default' in storagegroups.keys():
+        logger.critical("There must be a 'Default' storage group")
         if test_environment:
             requirements_are_met = False
         else:
             sys.exit(1)
 
     if opts.channel:
-        channel = opts.channel.split(u':')
+        channel = opts.channel.split(':')
         if len(channel) != 2:
-            logger.critical((u"The Channel (%s) must be in the format xxx:yyy with x and "\
-                             u"y all numeric.") % str(opts.channel))
+            logger.critical(("The Channel (%s) must be in the format xxx:yyy with x and "\
+                             "y all numeric.") % str(opts.channel))
             if test_environment:
                 requirements_are_met = False
             else:
                 sys.exit(1)
         elif not _can_int(channel[0]) or  not _can_int(channel[1]):
-            logger.critical(u"The Channel_id (%s) and Channel_num (%s) must be numeric." % \
+            logger.critical("The Channel_id (%s) and Channel_num (%s) must be numeric." % \
                                     (channel[0], channel[1]))
             if test_environment:
                 requirements_are_met = False
@@ -2250,7 +2249,7 @@ def main():
 
     if opts.sleeptime:
         if not _can_int(opts.sleeptime):
-            logger.critical(u"Auto-download sleep time (%s) must be numeric." % str(opts.sleeptime))
+            logger.critical("Auto-download sleep time (%s) must be numeric." % str(opts.sleeptime))
             if test_environment:
                 requirements_are_met = False
             else:
@@ -2268,31 +2267,31 @@ def main():
 
     if opts.watch_only:
         # ALL Miro videos will only be viewed in the MythTV "Watch Recordings" screen
-        channel_watch_only = [u'all']
+        channel_watch_only = ['all']
 
     if opts.mythvideo_only: # ALL Miro videos will be copied to MythVideo and removed from Miro
-        channel_mythvideo_only = {u'all': vid_graphics_dirs[u'mythvideo']+u'Miro/'}
+        channel_mythvideo_only = {'all': vid_graphics_dirs['mythvideo']+'Miro/'}
 
     # Once watched ALL Miro videos will be copied to MythVideo and removed from Miro
     if opts.new_watch_copy:
-        channel_new_watch_copy = {u'all': vid_graphics_dirs[u'mythvideo']+u'Miro/'}
+        channel_new_watch_copy = {'all': vid_graphics_dirs['mythvideo']+'Miro/'}
 
     # Verify that "Mythvideo Only" and "New-Watch-Copy" channels do not clash
     if len(channel_mythvideo_only) and len(channel_new_watch_copy):
         for key in channel_mythvideo_only.keys():
             if key in channel_new_watch_copy.keys():
-                logger.critical((u'The Miro Channel (%s) cannot be used as both a "Mythvideo '\
-                                 u'Only" and "New-Watch-Copy" channel.') % key)
+                logger.critical(('The Miro Channel (%s) cannot be used as both a "Mythvideo '\
+                                 'Only" and "New-Watch-Copy" channel.') % key)
                 if test_environment:
                     requirements_are_met = False
                 else:
                     sys.exit(1)
 
     # Verify that ImageMagick is installed
-    ret = useImageMagick(u"convert -version")
+    ret = useImageMagick("convert -version")
     if ret < 0 or ret > 1:
-        logger.critical(u"ImageMagick must be installed, graphics cannot be resized or "\
-                        u"converted to the required graphics format (e.g. jpg and or png)")
+        logger.critical("ImageMagick must be installed, graphics cannot be resized or "\
+                        "converted to the required graphics format (e.g. jpg and or png)")
         if test_environment:
             requirements_are_met = False
         else:
@@ -2300,12 +2299,12 @@ def main():
 
     # Verify that the "DeletesFollowLinks" setting is not set to the character '1'
     if mythdb.settings.NULL.DeletesFollowLinks == '1':
-        logger.critical(u'The MythTV back end setting "Follow symbolic links when deleting '\
-                        u'files" is checked and it is incompatible with MiroBridge processing. '\
-                        u'It must be unchecked it to use MiroBridge.\nTo uncheck this setting '\
-                        u'start "mythtv-setup" or with Mythbuntu start "MythTV Backend Setup" '\
-                        u'and then General->Miscellaneous Settings and uncheck the "Follow '\
-                        u'symbolic links when deleting files" setting')
+        logger.critical('The MythTV back end setting "Follow symbolic links when deleting '\
+                        'files" is checked and it is incompatible with MiroBridge processing. '\
+                        'It must be unchecked it to use MiroBridge.\nTo uncheck this setting '\
+                        'start "mythtv-setup" or with Mythbuntu start "MythTV Backend Setup" '\
+                        'and then General->Miscellaneous Settings and uncheck the "Follow '\
+                        'symbolic links when deleting files" setting')
         if test_environment:
             requirements_are_met = False
         else:
@@ -2325,17 +2324,17 @@ def main():
                 )
 
     if opts.testenv:        # All tests passed
-        metadata.getVideoDetails(u"") # Test that ffmpeg is available
+        metadata.getVideoDetails("") # Test that ffmpeg is available
         if ffmpeg and requirements_are_met:
-            logger.info(u"The environment test passed !\n\n")
+            logger.info("The environment test passed !\n\n")
             sys.exit(0)
         else:
-            logger.critical(u"The environment test FAILED. See previously displayed error messages!")
+            logger.critical("The environment test FAILED. See previously displayed error messages!")
             sys.exit(1)
 
-    if opts.addchannel != u'OFF':    # Add a Miro Channel record - Should only be done once
+    if opts.addchannel != 'OFF':    # Add a Miro Channel record - Should only be done once
         createChannelRecord(opts.addchannel, channel_id, channel_num)
-        logger.info(u"The Miro Channel record has been successfully created !\n\n")
+        logger.info("The Miro Channel record has been successfully created !\n\n")
         sys.exit(0)
 
 
@@ -2346,24 +2345,24 @@ def main():
     #
     # Start the Miro Front and Backend - This allows mirobridge to execute actions on the Miro backend
     #
-    displayMessage(u"Starting Miro Frontend and Backend")
+    displayMessage("Starting Miro Frontend and Backend")
     startup.initialize(miroConfiguration(prefs.THEME_NAME))
     #
     # Only required for Miro 4
-    if miroConfiguration(prefs.APP_VERSION)[0] == u"4":
+    if miroConfiguration(prefs.APP_VERSION)[0] == "4":
         app.info_updater = InfoUpdater()
     app.cli_events = EventHandler()
     app.cli_events.connect_to_signals()
 
     # Only required for Miro 4 and higher
-    if miroConfiguration(prefs.APP_VERSION) > u"4.0":
+    if miroConfiguration(prefs.APP_VERSION) > "4.0":
         startup.install_first_time_handler(app.cli_events.handle_first_time)
 
     startup.startup()
     app.cli_events.startup_event.wait()
     if app.cli_events.startup_failure:
         logger.critical(
-u"Starting Miro Frontend and Backend failed: (%s)\n(%s)" % \
+"Starting Miro Frontend and Backend failed: (%s)\n(%s)" % \
             (app.cli_events.startup_failure[0],
             app.cli_events.startup_failure[1]))
         app.controller.shutdown()
@@ -2371,10 +2370,10 @@ def main():
         sys.exit(1)
 
     # Only required for Miro 4
-    if miroConfiguration(prefs.APP_VERSION)[0] == u"4":
+    if miroConfiguration(prefs.APP_VERSION)[0] == "4":
         app.movie_data_program_info = movie_data_program_info
     # Only required for Miro 4 and higher
-    if miroConfiguration(prefs.APP_VERSION) > u"4.0":
+    if miroConfiguration(prefs.APP_VERSION) > "4.0":
         messages.FrontendStarted().send_to_backend()
 
     app.cli_interpreter = MiroInterpreter()
@@ -2391,9 +2390,9 @@ def main():
     app.cli_interpreter.statistics = statistics
     #
     ## Version specific logic
-    if miroConfiguration(prefs.APP_VERSION) < u"2.5.0":
+    if miroConfiguration(prefs.APP_VERSION) < "2.5.0":
         app.renderer = app.cli_interpreter
-    elif miroConfiguration(prefs.APP_VERSION) > u"4.0":
+    elif miroConfiguration(prefs.APP_VERSION) > "4.0":
         pass
     else:
         app.movie_data_program_info = \
@@ -2409,7 +2408,7 @@ def main():
             # Let the Miro backend process the OPML file before shutting down
             time.sleep(30)
         except Exception, e:
-            logger.critical(u"Import of OPML file (%s) failed, error(%s)." %
+            logger.critical("Import of OPML file (%s) failed, error(%s)." %
                                     (opts.import_opml, e))
             results = 1
         # Gracefully close the Miro database and shutdown the Miro Front and Back ends
@@ -2424,17 +2423,17 @@ def main():
     if not opts.no_autodownload:
         if opts.verbose:
             app.cli_interpreter.verbose = False
-        app.cli_interpreter.do_mythtv_getunwatched(u'')
+        app.cli_interpreter.do_mythtv_getunwatched('')
         before_download = len(app.cli_interpreter.videofiles)
         if opts.verbose:
             app.cli_interpreter.verbose = True
-        if miroConfiguration(prefs.APP_VERSION) < u"4.0":
+        if miroConfiguration(prefs.APP_VERSION) < "4.0":
             # Miro 4 automatically refreshes feeds and downloads
-            app.cli_interpreter.do_mythtv_update_autodownload(u'')
+            app.cli_interpreter.do_mythtv_update_autodownload('')
         time.sleep(download_sleeptime)
         firsttime = True
         while True:
-            app.cli_interpreter.do_mythtv_check_downloading(u'')
+            app.cli_interpreter.do_mythtv_check_downloading('')
             if app.cli_interpreter.downloading:
                 time.sleep(30)
                 firsttime = False
@@ -2447,9 +2446,9 @@ def main():
                 break
         if opts.verbose:
             app.cli_interpreter.verbose = False
-        app.cli_interpreter.do_mythtv_getunwatched(u'')
+        app.cli_interpreter.do_mythtv_getunwatched('')
         after_download = len(app.cli_interpreter.videofiles)
-        statistics[u'Miros_videos_downloaded'] = after_download - before_download
+        statistics['Miros_videos_downloaded'] = after_download - before_download
         if opts.verbose:
             app.cli_interpreter.verbose = True
 
@@ -2460,12 +2459,12 @@ def main():
     videostodelete = getOldrecordedOrphans()
     if len(videostodelete):
         displayMessage(
-            u"Starting Miro delete of videos deleted in the MythTV "\
-                       u"Watched Recordings screen.")
+            "Starting Miro delete of videos deleted in the MythTV "\
+                       "Watched Recordings screen.")
         for video in videostodelete:
             # Completely remove the video and item information from Miro
             app.cli_interpreter.do_mythtv_item_remove(
-                            [video[u'title'], video[u'subtitle']])
+                            [video['title'], video['subtitle']])
 
     #
     # Collect the set of played Miro video files
@@ -2475,34 +2474,34 @@ def main():
     # Updated the played status of items
     #
     if app.cli_interpreter.videofiles:
-        displayMessage(u"Starting Miro update of watched MythTV videos")
-        app.cli_interpreter.do_mythtv_updatewatched(u'')
+        displayMessage("Starting Miro update of watched MythTV videos")
+        app.cli_interpreter.do_mythtv_updatewatched('')
 
     #
     # Get the unwatched videos details from Miro
     #
-    app.cli_interpreter.do_mythtv_getunwatched(u'')
+    app.cli_interpreter.do_mythtv_getunwatched('')
     unwatched = app.cli_interpreter.videofiles
     #
     # Get the watched videos details from Miro
     #
-    app.cli_interpreter.do_mythtv_getwatched(u'')
+    app.cli_interpreter.do_mythtv_getwatched('')
     watched = app.cli_interpreter.videofiles
     #
     # Massage empty titles and subtitles from Miro
     #
     for item in unwatched:
         # Deal with empty titles and subtitles from Miro
-        if not item[u'channelTitle']:
-            item[u'channelTitle'] = emptyTitle
-        if not item[u'title']:
-            item[u'title'] = emptySubTitle
+        if not item['channelTitle']:
+            item['channelTitle'] = emptyTitle
+        if not item['title']:
+            item['title'] = emptySubTitle
     for item in watched:
         # Deal with empty titles and subtitles from Miro
-        if not item[u'channelTitle']:
-            item[u'channelTitle'] = emptyTitle
-        if not item[u'title']:
-            item[u'title'] = emptySubTitle
+        if not item['channelTitle']:
+            item['channelTitle'] = emptyTitle
+        if not item['title']:
+            item['title'] = emptySubTitle
 
     #
     # Remove any duplicate Miro videoes from the unwatched or watched list of Miro videos
@@ -2514,32 +2513,32 @@ def main():
         unwatched_copy.append(item)
     for item in unwatched_copy: # Check for a duplicate against already watched Miro videos
         for x in watched:
-            if item[u'channelTitle'] == x[u'channelTitle'] and \
-                                        item[u'title'] == x[u'title']:
+            if item['channelTitle'] == x['channelTitle'] and \
+                                        item['title'] == x['title']:
                 try:
                     unwatched.remove(item)
                     # Completely remove this duplicate video and item information from Miro
                     app.cli_interpreter.do_mythtv_item_remove(
-                                                item[u'videoFilename'])
+                                                item['videoFilename'])
                     displayMessage((
-u'''Skipped adding a duplicate Miro video to the MythTV
+'''Skipped adding a duplicate Miro video to the MythTV
 Watch Recordings screen (%s - %s) which is already in
 MythVideo.
 Sometimes a Miro channel has the same video
 downloaded multiple times.
 This is a Miro/Channel web site issue and often
-rectifies itself overtime.''') % (item[u'channelTitle'], item[u'title']))
+rectifies itself overtime.''') % (item['channelTitle'], item['title']))
                 except ValueError:
                     pass
     duplicates = []
     for item in unwatched_copy:
         dup_flag = 0
         for x in unwatched: # Check for a duplicate against un-watched Miro videos
-            if item[u'channelTitle'] == x[u'channelTitle'] and item[u'title'] == x[u'title']:
+            if item['channelTitle'] == x['channelTitle'] and item['title'] == x['title']:
                 dup_flag+=1
         if dup_flag > 1:
             for x in duplicates:
-                if item[u'channelTitle'] == x[u'channelTitle'] and item[u'title'] == x[u'title']:
+                if item['channelTitle'] == x['channelTitle'] and item['title'] == x['title']:
                     break
             else:
                 duplicates.append(item)
@@ -2548,13 +2547,13 @@ def main():
         try:
             unwatched.remove(duplicate)
             # Completely remove this duplicate video and item information from Miro
-            app.cli_interpreter.do_mythtv_item_remove(duplicate[u'videoFilename'])
-            displayMessage((u"Skipped adding a Miro video to the MythTV Watch Recordings "\
-                            u"screen (%s - %s) as there are duplicate 'new' video items."\
-                            u"\nSometimes a Miro channel has the same video downloaded "\
-                            u"multiple times.\nThis is a Miro/Channel web site issue and "\
-                            u"often rectifies itself overtime.") % \
-                                    (duplicate[u'channelTitle'], duplicate[u'title']))
+            app.cli_interpreter.do_mythtv_item_remove(duplicate['videoFilename'])
+            displayMessage(("Skipped adding a Miro video to the MythTV Watch Recordings "\
+                            "screen (%s - %s) as there are duplicate 'new' video items."\
+                            "\nSometimes a Miro channel has the same video downloaded "\
+                            "multiple times.\nThis is a Miro/Channel web site issue and "\
+                            "often rectifies itself overtime.") % \
+                                    (duplicate['channelTitle'], duplicate['title']))
         except ValueError:
             pass
 
@@ -2563,23 +2562,23 @@ def main():
     #
     copy_items = []
     # Copy unwatched and watched Miro videos (all or only selected Channels)
-    if u'all' in channel_mythvideo_only.keys():
+    if 'all' in channel_mythvideo_only.keys():
         for array in [watched, unwatched]:
             for item in array:
                 copy_items.append(item)
     elif len(channel_mythvideo_only):
         for array in [watched, unwatched]:
             for video in array:
-                if filter(is_not_punct_char, video[u'channelTitle'].lower()) in \
+                if filter(is_not_punct_char, video['channelTitle'].lower()) in \
                             channel_mythvideo_only.keys():
                     copy_items.append(video)
     # Copy ONLY watched Miro videos (all or only selected Channels)
-    if u'all' in channel_new_watch_copy.keys():
+    if 'all' in channel_new_watch_copy.keys():
         for video in watched:
             copy_items.append(video)
     elif len(channel_new_watch_copy):
         for video in watched:
-            if filter(is_not_punct_char, video[u'channelTitle'].lower()) in \
+            if filter(is_not_punct_char, video['channelTitle'].lower()) in \
                             channel_new_watch_copy.keys():
                 copy_items.append(video)
 
@@ -2591,145 +2590,145 @@ def main():
 
     for video in copy_items:
         if channels_to_copy.has_key('all'):
-            copy_dir = u"%s%s/" % (channels_to_copy['all'], sanitiseFileName(video[u'channelTitle']))
+            copy_dir = "%s%s/" % (channels_to_copy['all'], sanitiseFileName(video['channelTitle']))
         else:
-            copy_dir = channels_to_copy[filter(is_not_punct_char, video[u'channelTitle'].lower())]
+            copy_dir = channels_to_copy[filter(is_not_punct_char, video['channelTitle'].lower())]
 
         # Create the subdirectories to copy the video into
         if not os.path.isdir(copy_dir):
             if simulation:
-                logger.info(u"Simulation: Creating the MythVideo directory (%s)." % (copy_dir))
+                logger.info("Simulation: Creating the MythVideo directory (%s)." % (copy_dir))
             else:
                 os.makedirs(copy_dir)
 
         # Copy the Miro video file
         # This filename is needed later for deleting in Miro
-        save_video_filename = video[u'videoFilename']
-        ext = getExtention(video[u'videoFilename'])
-        if ext.lower() == u'm4v':
-            ext = u'mpg'
-        filepath = u"%s%s - %s.%s" % (copy_dir, sanitiseFileName(video[u'channelTitle']),
-                                      sanitiseFileName(video[u'title']), ext)
+        save_video_filename = video['videoFilename']
+        ext = getExtention(video['videoFilename'])
+        if ext.lower() == 'm4v':
+            ext = 'mpg'
+        filepath = "%s%s - %s.%s" % (copy_dir, sanitiseFileName(video['channelTitle']),
+                                      sanitiseFileName(video['title']), ext)
         if simulation:
-            logger.info(u"Simulation: Copying the Miro video (%s) to the MythVideo directory (%s)." % \
-                                (video[u'videoFilename'], filepath))
+            logger.info("Simulation: Copying the Miro video (%s) to the MythVideo directory (%s)." % \
+                                (video['videoFilename'], filepath))
         else:
             try:    # Miro video copied into a MythVideo directory
-                shutil.copy2(video[u'videoFilename'], filepath)
-                statistics[u'Miros_MythVideos_copied']+=1
-                if u'mythvideo' in storagegroups.keys() and not local_only:
-                    video[u'videoFilename'] = filepath.replace(storagegroups[u'mythvideo'], u'')
+                shutil.copy2(video['videoFilename'], filepath)
+                statistics['Miros_MythVideos_copied']+=1
+                if 'mythvideo' in storagegroups.keys() and not local_only:
+                    video['videoFilename'] = filepath.replace(storagegroups['mythvideo'], '')
                 else:
-                    video[u'videoFilename'] = filepath
+                    video['videoFilename'] = filepath
             except Exception, e:
-                logger.critical((u"Copying the Miro video (%s) to the MythVideo directory (%s)."\
-                                 u"\n         This maybe a permissions error (mirobridge.py does "\
-                                 u"not have permission to write to the directory), error(%s)") % \
-                                            (video[u'videoFilename'], filepath, e))
+                logger.critical(("Copying the Miro video (%s) to the MythVideo directory (%s)."\
+                                 "\n         This maybe a permissions error (mirobridge.py does "\
+                                 "not have permission to write to the directory), error(%s)") % \
+                                            (video['videoFilename'], filepath, e))
                 # Gracefully close the Miro database and shutdown the Miro Front and Back ends
                 app.controller.shutdown()
                 time.sleep(5) # Let the shutdown processing complete
                 sys.exit(1)
 
         # Copy the Channel or item's icon
-        if video[u'channel_icon'] and not video[u'channelTitle'].lower() in channel_icon_override:
+        if video['channel_icon'] and not video['channelTitle'].lower() in channel_icon_override:
             pass
         else:
-            if video[u'item_icon']:
-                video[u'channel_icon'] = video[u'item_icon']
+            if video['item_icon']:
+                video['channel_icon'] = video['item_icon']
         # Get any graphics that already exist
-        graphics = metadata.getMetadata(sanitiseFileName(video[u'channelTitle']))
-        if video[u'channel_icon'] and graphics['coverart'] == u'':
-            ext = getExtention(video[u'channel_icon'])
-            if video[u'channelTitle'].lower() in channel_icon_override:
-                filepath = u"%s%s - %s%s.%s" % (vid_graphics_dirs[u'posterdir'],
-                                                sanitiseFileName(video[u'channelTitle']),
-                                                sanitiseFileName(video[u'title']),
-                                                graphic_suffix[u'posterdir'], ext)
+        graphics = metadata.getMetadata(sanitiseFileName(video['channelTitle']))
+        if video['channel_icon'] and graphics['coverart'] == '':
+            ext = getExtention(video['channel_icon'])
+            if video['channelTitle'].lower() in channel_icon_override:
+                filepath = "%s%s - %s%s.%s" % (vid_graphics_dirs['posterdir'],
+                                                sanitiseFileName(video['channelTitle']),
+                                                sanitiseFileName(video['title']),
+                                                graphic_suffix['posterdir'], ext)
             else:
-                filepath = u"%s%s%s.%s" % (vid_graphics_dirs[u'posterdir'],
-                                           sanitiseFileName(video[u'channelTitle']),
-                                           graphic_suffix[u'posterdir'], ext)
+                filepath = "%s%s%s.%s" % (vid_graphics_dirs['posterdir'],
+                                           sanitiseFileName(video['channelTitle']),
+                                           graphic_suffix['posterdir'], ext)
             # There may already be a Channel icon available
             # or it is a symlink which needs to be replaced
             if not os.path.isfile(filepath) or os.path.islink(filepath):
                 if simulation:
-                    logger.info((u"Simulation: Copying the Channel Icon (%s) to the poster "\
-                                 u"directory (%s).") % (video[u'channel_icon'], filepath))
+                    logger.info(("Simulation: Copying the Channel Icon (%s) to the poster "\
+                                 "directory (%s).") % (video['channel_icon'], filepath))
                 else:
                     try:    # Miro Channel icon copied into a MythVideo directory
                         try: # Remove any old symlink file
                             os.remove(filepath)
                         except OSError:
                             pass
-                        shutil.copy2(video[u'channel_icon'], filepath)
-                        if u'posterdir' in storagegroups.keys() and not local_only:
-                            video[u'channel_icon'] = filepath.replace(storagegroups[u'posterdir'], u'')
+                        shutil.copy2(video['channel_icon'], filepath)
+                        if 'posterdir' in storagegroups.keys() and not local_only:
+                            video['channel_icon'] = filepath.replace(storagegroups['posterdir'], '')
                         else:
-                            video[u'channel_icon'] = filepath
+                            video['channel_icon'] = filepath
                     except Exception, e:
-                        logger.critical((u"Copying the Channel Icon (%s) to the poster directory "\
-                                         u"(%s).\n         This maybe a permissions error "\
-                                         u"(mirobridge.py does not have permission to write to the "\
-                                         u"directory), error(%s)") % \
-                                    (video[u'channel_icon'], filepath, e))
+                        logger.critical(("Copying the Channel Icon (%s) to the poster directory "\
+                                         "(%s).\n         This maybe a permissions error "\
+                                         "(mirobridge.py does not have permission to write to the "\
+                                         "directory), error(%s)") % \
+                                    (video['channel_icon'], filepath, e))
                         # Gracefully close the Miro database and shutdown the Miro Front and Back ends
                         app.controller.shutdown()
                         time.sleep(5) # Let the shutdown processing complete
                         sys.exit(1)
             else:
-                if u'posterdir' in storagegroups.keys() and not local_only:
-                    video[u'channel_icon'] = filepath.replace(storagegroups[u'posterdir'], u'')
+                if 'posterdir' in storagegroups.keys() and not local_only:
+                    video['channel_icon'] = filepath.replace(storagegroups['posterdir'], '')
                 else:
-                    video[u'channel_icon'] = filepath
+                    video['channel_icon'] = filepath
         else:
-            video[u'channel_icon'] = graphics['coverart']
+            video['channel_icon'] = graphics['coverart']
 
         # There may already be a Screenshot available or it is a symlink which needs to be replaced
-        if video[u'screenshot']:
-            ext = getExtention(video[u'screenshot'])
-            filepath = u"%s%s - %s%s.%s" % (vid_graphics_dirs[u'episodeimagedir'],
-                                            sanitiseFileName(video[u'channelTitle']),
-                                            sanitiseFileName(video[u'title']),
-                                            graphic_suffix[u'episodeimagedir'], ext)
+        if video['screenshot']:
+            ext = getExtention(video['screenshot'])
+            filepath = "%s%s - %s%s.%s" % (vid_graphics_dirs['episodeimagedir'],
+                                            sanitiseFileName(video['channelTitle']),
+                                            sanitiseFileName(video['title']),
+                                            graphic_suffix['episodeimagedir'], ext)
         else:
-            filepath = u''
+            filepath = ''
 
         if not os.path.isfile(filepath) or os.path.islink(filepath):
-            if video[u'screenshot']:
+            if video['screenshot']:
                 if simulation:
-                    logger.info((u"Simulation: Copying the Screenshot (%s) to the Screenshot "\
-                                 u"directory (%s).") % (video[u'screenshot'], filepath))
+                    logger.info(("Simulation: Copying the Screenshot (%s) to the Screenshot "\
+                                 "directory (%s).") % (video['screenshot'], filepath))
                 else:
                     try:    # Miro Channel icon copied into a MythVideo directory
                         try: # Remove any old symlink file
                             os.remove(filepath)
                         except OSError:
                             pass
-                        shutil.copy2(video[u'screenshot'], filepath)
-                        displayMessage(u"Copied Miro screenshot file (%s) to MythVideo (%s)" % \
-                                                (video[u'screenshot'], filepath))
-                        if u'episodeimagedir' in storagegroups.keys() and not local_only:
-                            video[u'screenshot'] = filepath.replace(storagegroups[u'episodeimagedir'],
-                                                                    u'')
+                        shutil.copy2(video['screenshot'], filepath)
+                        displayMessage("Copied Miro screenshot file (%s) to MythVideo (%s)" % \
+                                                (video['screenshot'], filepath))
+                        if 'episodeimagedir' in storagegroups.keys() and not local_only:
+                            video['screenshot'] = filepath.replace(storagegroups['episodeimagedir'],
+                                                                    '')
                         else:
-                            video[u'screenshot'] = filepath
+                            video['screenshot'] = filepath
                     except Exception, e:
-                        logger.critical((u"Copying the Screenshot (%s) to the Screenshot directory "\
-                                         u"(%s).\n         This maybe a permissions error "\
-                                         u"(mirobridge.py does not have permission to write to the "\
-                                         u"directory), error(%s)") % \
-                                (video[u'screenshot'], filepath, e))
+                        logger.critical(("Copying the Screenshot (%s) to the Screenshot directory "\
+                                         "(%s).\n         This maybe a permissions error "\
+                                         "(mirobridge.py does not have permission to write to the "\
+                                         "directory), error(%s)") % \
+                                (video['screenshot'], filepath, e))
                         # Gracefully close the Miro database and shutdown the Miro Front and Back ends
                         app.controller.shutdown()
                         time.sleep(5) # Let the shutdown processing complete
                         sys.exit(1)
-        elif video[u'screenshot']:
-            if u'episodeimagedir' in storagegroups.keys() and not local_only:
-                video[u'screenshot'] = filepath.replace(storagegroups[u'episodeimagedir'], u'')
+        elif video['screenshot']:
+            if 'episodeimagedir' in storagegroups.keys() and not local_only:
+                video['screenshot'] = filepath.replace(storagegroups['episodeimagedir'], '')
             else:
-                video[u'screenshot'] = filepath
-        video[u'copied'] = True     # Mark this video item as being copied
+                video['screenshot'] = filepath
+        video['copied'] = True     # Mark this video item as being copied
 
         # Completely remove the video and item information from Miro
         app.cli_interpreter.do_mythtv_item_remove(save_video_filename)
@@ -2745,7 +2744,7 @@ def main():
     #
 
     # Check if the user does not want any channels Added to the "Watch Recordings" screen
-    if channel_mythvideo_only.has_key(u'all'):
+    if channel_mythvideo_only.has_key('all'):
         for video in unwatched:
             watched.append(video)
         unwatched = []
@@ -2753,18 +2752,18 @@ def main():
         if len(channel_mythvideo_only):
             unwatched_copy = []
             for video in unwatched:
-                if not filter(is_not_punct_char, video[u'channelTitle'].lower()) in \
+                if not filter(is_not_punct_char, video['channelTitle'].lower()) in \
                             channel_mythvideo_only.keys():
                     unwatched_copy.append(video)
                 else:
                     watched.append(video)
             unwatched = unwatched_copy
 
-    statistics[u'Total_unwatched'] = len(unwatched)
+    statistics['Total_unwatched'] = len(unwatched)
     if not len(unwatched):
-        displayMessage(u"There are no Miro unwatched video items to add as MythTV Recorded videos.")
+        displayMessage("There are no Miro unwatched video items to add as MythTV Recorded videos.")
     if not updateMythRecorded(unwatched):
-        logger.critical(u"Updating MythTV Recording with Miro video files failed." % \
+        logger.critical("Updating MythTV Recording with Miro video files failed." % \
                                     str(base_video_dir))
         sys.exit(1)
 
@@ -2774,14 +2773,14 @@ def main():
     # Add and delete symbolic links to coverart/Miro icons and Miro screenshots/fanart
     #
     if len(channel_watch_only): # If the user does not want any channels moved to MythVideo exit
-        if channel_watch_only[0].lower() == u'all':
+        if channel_watch_only[0].lower() == 'all':
             printStatistics()
             return True
 
     if not len(watched):
-        displayMessage(u"There are no Miro watched items to add to MythVideo")
+        displayMessage("There are no Miro watched items to add to MythVideo")
     if not updateMythVideo(watched):
-        logger.critical(u"Updating MythVideo with Miro video files failed.")
+        logger.critical("Updating MythVideo with Miro video files failed.")
         sys.exit(1)
 
     printStatistics()
@@ -2789,14 +2788,14 @@ def main():
 # end main
 
 if __name__ == "__main__":
-    myapp = singleinstance(u'/tmp/mirobridge.pid')
+    myapp = singleinstance('/tmp/mirobridge.pid')
     #
     # check is another instance of Miro Bridge running
     #
     if myapp.alreadyrunning():
-        print u'\nMiro Bridge is already running only one instance can run at a time\n\n'
+        print '\nMiro Bridge is already running only one instance can run at a time\n\n'
         sys.exit(0)
 
     main()
-    displayMessage(u"Miro Bridge Processing completed")
+    displayMessage("Miro Bridge Processing completed")
 
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/metadata.py b/mythtv/contrib/imports/mirobridge/mirobridge/metadata.py
index 76cbe025291..98eb4f759de 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/metadata.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/metadata.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: metadata.py   Performs all metadata/graphics functions for MiroBridge
 # Python Script
@@ -152,16 +151,16 @@ def __init__(self,
                 sys.exit(1)
             confdir = os.path.join(confdir, '.mythtv')
         self.cache_dir=os.path.join(confdir, "cache/tvdb_api/")
-        self.ttvdb = tvdb_api.Tvdb(banners=False, debug = False, cache = self.cache_dir, custom_ui=None, language = u'en', apikey="0BB856A59C51D607")
-        self.makeRecordRule = {'chanid': channel_id, 'description': u'Mirobridge Record rule used to acquire ttvdb.com artwork',
-                               'autometadata': 1, 'season': 1, 'episode': 1, 'category': u'Miro', 'station': u'Miro'  }
+        self.ttvdb = tvdb_api.Tvdb(banners=False, debug = False, cache = self.cache_dir, custom_ui=None, language = 'en', apikey="0BB856A59C51D607")
+        self.makeRecordRule = {'chanid': channel_id, 'description': 'Mirobridge Record rule used to acquire ttvdb.com artwork',
+                               'autometadata': 1, 'season': 1, 'episode': 1, 'category': 'Miro', 'station': 'Miro'  }
     # end __init__()
 
     def getMetadata(self, title):
         """Find existing graphics for a Miro video.
         return a dictionary of metadata
         """
-        ttvdbGraphics = {'inetref': u'', 'coverart': u'', 'banner': u'', 'fanart': u'', } # Initalize dictionary of graphics
+        ttvdbGraphics = {'inetref': '', 'coverart': '', 'banner': '', 'fanart': '', } # Initalize dictionary of graphics
 
         # Check for an existing Record Rule for this Miro Channel title
         recordedRules_array = list(self.mythdb.searchRecord(title=title))
@@ -174,11 +173,11 @@ def getMetadata(self, title):
                 self.makeRecordRule['title'] = title
                 self.makeRecordRule['inetref'] = inetref
                 if self.simulation:
-                    self.logger.info(u"Simulation: Create Recoding rule for Title(%s) inetref(%s)" % (self.makeRecordRule['title'], self.makeRecordRule['inetref'], ))
+                    self.logger.info("Simulation: Create Recoding rule for Title(%s) inetref(%s)" % (self.makeRecordRule['title'], self.makeRecordRule['inetref'], ))
                 else:
                     record = self.Record().create(self.makeRecordRule)
                     if self.verbose:
-                        self.logger.info(u"Created Recoding rule for Title(%s) inetref(%s)" % (self.makeRecordRule['title'], self.makeRecordRule['inetref'], ))
+                        self.logger.info("Created Recoding rule for Title(%s) inetref(%s)" % (self.makeRecordRule['title'], self.makeRecordRule['inetref'], ))
             return ttvdbGraphics
 
         # Find a matching recordedartwork record to acquire the graphic images
@@ -191,7 +190,7 @@ def getMetadata(self, title):
         # Check if the coverart exists even though a recordartwork record did not have any.
         # This makes sure that low quality coverart is not automatically created when an image already exists.
         if not ttvdbGraphics['coverart']:
-            result = glob.glob(u'%s%s Season*_coverart.*' % (self.vid_graphics_dirs['posterdir'], title, ))
+            result = glob.glob('%s%s Season*_coverart.*' % (self.vid_graphics_dirs['posterdir'], title, ))
             if len(result):
                 ttvdbGraphics['coverart'] = result[0]
 
@@ -206,15 +205,15 @@ def convertOldMiroVideos(self):
         to the "watch_then_copy" and "mythvideo_only" config options to still work.
         return count of converted videometadata records
         """
-        videometadata = list(self.mythdb.searchVideos(category=u'Miro', custom=(('inetref=%s',u'99999999'),)))
+        videometadata = list(self.mythdb.searchVideos(category='Miro', custom=(('inetref=%s','99999999'),)))
         if not len(videometadata):
             return
         for record in videometadata:
             # Make sure the record is an absolute path
-            if not record[u'host'] or record[u'filename'][0] == '/':
-                filename = record[u'filename']
+            if not record['host'] or record['filename'][0] == '/':
+                filename = record['filename']
             else:
-                filename = self.vid_graphics_dirs['mythvideo']+record[u'filename']
+                filename = self.vid_graphics_dirs['mythvideo']+record['filename']
 
             # Skip any videos that are still expiring in Miro
             if os.path.islink(filename):
@@ -223,13 +222,13 @@ def convertOldMiroVideos(self):
             # Convert the old Miro copied video to be independant of MiroBridge processing
             graphics = self.getMetadata(record['title'])
             record['inetref'] = graphics['inetref']
-            record['category'] = u'Video Cast'
+            record['category'] = 'Video Cast'
             if self.simulation:
-                self.logger.info(u"Simulation: Converting old copied Miro video Title(%s) file(%s)" % (record[u'title'], record[u'filename'], ))
+                self.logger.info("Simulation: Converting old copied Miro video Title(%s) file(%s)" % (record['title'], record['filename'], ))
             else:
                 self.Video(record['intid'], db=self.mythdb).update(record)
                 if self.verbose:
-                    self.logger.info(u"Converting old copied Miro video Title(%s) file(%s)" % (record[u'title'], record[u'filename'], ))
+                    self.logger.info("Converting old copied Miro video Title(%s) file(%s)" % (record['title'], record['filename'], ))
         return
     # end convertOldMiroVideos()
 
@@ -240,14 +239,14 @@ def cleanupVideoAndGraphics(self, fileName):
         (dirName, fileName) = os.path.split(fileName)
         (fileBaseName, fileExtension)=os.path.splitext(fileName)
         try:
-            results = glob.glob(u'%s/%s*' % (dirName, fileBaseName, ))
+            results = glob.glob('%s/%s*' % (dirName, fileBaseName, ))
         except (UnicodeEncodeError, UnicodeDecodeError, TypeError):
             return
         if len(results):
             for result in results:
                 try:
                     if self.simulation:
-                        self.logger.info(u"Simulation: Remove file/symbolic link(%s)" % result)
+                        self.logger.info("Simulation: Remove file/symbolic link(%s)" % result)
                     else:
                         os.remove(result)
                 except (UnicodeEncodeError, UnicodeDecodeError, TypeError, OSError):
@@ -259,10 +258,10 @@ def deleteFile(self, filename, host, groupKey):
         """Delete a file that may or may not exist
         return nothing
         """
-        if filename[0] == u'/':
+        if filename[0] == '/':
             try:
                 if self.simulation:
-                    self.logger.info(u"Simulation: Remove of a file (%s)" % (filename))
+                    self.logger.info("Simulation: Remove of a file (%s)" % (filename))
                 else:
                     os.remove(filename)
             except OSError:
@@ -270,7 +269,7 @@ def deleteFile(self, filename, host, groupKey):
         elif host and self.storagegroups.has_key(groupKey):
             try:
                 if self.simulation:
-                    self.logger.info(u"Simulation: Remove of a file (%s)" % (self.storagegroups[groupKey]+filename))
+                    self.logger.info("Simulation: Remove of a file (%s)" % (self.storagegroups[groupKey]+filename))
                 else:
                     os.remove(self.storagegroups[groupKey]+filename)
             except OSError:
@@ -290,30 +289,30 @@ def takeScreenShot(self, videofile, screenshot_filename, size_limit=False, just_
             return None
         if not ffmpeg_details:
             return None
-        elif not u'width' in ffmpeg_details.keys():
+        elif not 'width' in ffmpeg_details.keys():
             return None
 
         max_length = 2*60    # Maximum length of a video check if set at 2 minutes
-        if ffmpeg_details[u'duration']:
-            if ffmpeg_details[u'duration'] < max_length:
-                delay = (ffmpeg_details[u'duration']/2) # Maximum time to take screenshot into a video is 1 minute
+        if ffmpeg_details['duration']:
+            if ffmpeg_details['duration'] < max_length:
+                delay = (ffmpeg_details['duration']/2) # Maximum time to take screenshot into a video is 1 minute
             else:
                 delay = 60 # For a large videos take screenshot at the 1 minute mark
 
-        cmd = u'ffmpeg -i "%s" -y -f image2 -ss %d -sameq -vframes 1 -s %d*%d "%s"'
+        cmd = 'ffmpeg -i "%s" -y -f image2 -ss %d -sameq -vframes 1 -s %d*%d "%s"'
 
-        width = int(ffmpeg_details[u'width'])
-        height = int(ffmpeg_details[u'height'])
+        width = int(ffmpeg_details['width'])
+        height = int(ffmpeg_details['height'])
 
         if size_limit:
             width = 320
-            height = (int(width * ffmpeg_details[u'aspect'])/2)*2 # ((xxxxx)/2) *2
+            height = (int(width * ffmpeg_details['aspect'])/2)*2 # ((xxxxx)/2) *2
 
         if just_demensions:
-            return u"%dx%d" % (width, height)
+            return "%dx%d" % (width, height)
 
         cmd2 = cmd % (videofile, delay, width, height, screenshot_filename)
-        return subprocess.call(u'%s > /dev/null 2>/dev/null' % cmd2, shell=True)
+        return subprocess.call('%s > /dev/null 2>/dev/null' % cmd2, shell=True)
     # end takeScreenShot()
 
     def getVideoDetails(self, videofilename, screenshot=False):
@@ -322,29 +321,29 @@ def getVideoDetails(self, videofilename, screenshot=False):
         return empty dictionary if the file is not a video
         return dictionary of the Video's details
         '''
-        ffmpeg_details = {u'video': u'', u'audio': u'', u'duration': 0, u'stereo': 0, u'hdtv': 0}
+        ffmpeg_details = {'video': '', 'audio': '', 'duration': 0, 'stereo': 0, 'hdtv': 0}
 
         if not self.ffmpeg and not screenshot:
             return ffmpeg_details
         if not self.ffmpeg and screenshot:
             return False
 
-        video = re.compile(u' Video: ')
-        video_HDTV_small = re.compile(u' 1280x', re.UNICODE)
-        video_HDTV_large = re.compile(u' 1920x', re.UNICODE)
-        width_height = re.compile(u'''^(.+?)\[?([0-9]+)x([0-9]+)\\,[^\\/]''', re.UNICODE)
+        video = re.compile(' Video: ')
+        video_HDTV_small = re.compile(' 1280x', re.UNICODE)
+        video_HDTV_large = re.compile(' 1920x', re.UNICODE)
+        width_height = re.compile('''^(.+?)\\[?([0-9]+)x([0-9]+)\\,[^\\/]''', re.UNICODE)
 
-        audio = re.compile(u' Audio: ', re.UNICODE)
-        audio_stereo = re.compile(u' stereo,', re.UNICODE)
-        audio_mono = re.compile(u' mono,', re.UNICODE)
-        audio_ac3 = re.compile(u' ac3,', re.UNICODE)
-        audio_51 = re.compile(u' 5.1,', re.UNICODE)
-        audio_2C = re.compile(u' 2 channels,', re.UNICODE)
-        audio_1C = re.compile(u' 1 channels,', re.UNICODE)
-        audio_6C = re.compile(u' 6 channels,', re.UNICODE)
+        audio = re.compile(' Audio: ', re.UNICODE)
+        audio_stereo = re.compile(' stereo,', re.UNICODE)
+        audio_mono = re.compile(' mono,', re.UNICODE)
+        audio_ac3 = re.compile(' ac3,', re.UNICODE)
+        audio_51 = re.compile(' 5.1,', re.UNICODE)
+        audio_2C = re.compile(' 2 channels,', re.UNICODE)
+        audio_1C = re.compile(' 1 channels,', re.UNICODE)
+        audio_6C = re.compile(' 6 channels,', re.UNICODE)
 
         try:
-            p = subprocess.Popen(u'ffmpeg -i "%s"' % (videofilename), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            p = subprocess.Popen('ffmpeg -i "%s"' % (videofilename), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
         except:
             if not screenshot:
                 return ffmpeg_details
@@ -366,12 +365,12 @@ def getVideoDetails(self, videofilename, screenshot=False):
                 continue    # Skip any line that has non-utf8 characters in it
             except (UnicodeEncodeError, TypeError):
                 pass
-            if data.endswith(u'command not found\n'):
+            if data.endswith('command not found\n'):
                 ffmpeg_found = False
                 break
-            if data.startswith(u'  Duration:'):
+            if data.startswith('  Duration:'):
                 time = (data[data.index(':')+1: data.index('.')]).strip()
-                ffmpeg_details[u'duration'] = (360*(int(time[:2]))+(int(time[3:5])*60))+int(time[6:8])
+                ffmpeg_details['duration'] = (360*(int(time[:2]))+(int(time[3:5])*60))+int(time[6:8])
                 datacount+=1
             elif len(video.findall(data)):
                 match = width_height.match(data)
@@ -381,34 +380,34 @@ def getVideoDetails(self, videofilename, screenshot=False):
                     width, height = float(width), float(height)
                     aspect = height/width
                     if screenshot:
-                        ffmpeg_details[u'width'] = width
-                        ffmpeg_details[u'height'] = height
-                        ffmpeg_details[u'aspect'] = aspect
+                        ffmpeg_details['width'] = width
+                        ffmpeg_details['height'] = height
+                        ffmpeg_details['aspect'] = aspect
                     if width > 1300.0 or width > 800.0 or width == 720.0 or width == 1080.0 :
-                        ffmpeg_details[u'video']+=u'HDTV'
-                        ffmpeg_details[u'hdtv'] = 1
+                        ffmpeg_details['video']+='HDTV'
+                        ffmpeg_details['hdtv'] = 1
                     elif aspect <= 0.5625:
-                        ffmpeg_details[u'video']+=u'WIDESCREEN'
-                    if len(ffmpeg_details[u'video']):
-                        comma = u','
+                        ffmpeg_details['video']+='WIDESCREEN'
+                    if len(ffmpeg_details['video']):
+                        comma = ','
                     else:
-                        comma = u''
+                        comma = ''
                     if width > 1300.0:
-                        ffmpeg_details[u'video']+=comma+u'1080'
+                        ffmpeg_details['video']+=comma+'1080'
                     elif width > 800.0:
-                        ffmpeg_details[u'video']+=comma+u'720'
+                        ffmpeg_details['video']+=comma+'720'
             elif len(audio.findall(data)):
                 datacount+=1
                 if len(audio_stereo.findall(data)) or len(audio_2C.findall(data)):
-                    ffmpeg_details[u'audio']+=u'STEREO'
-                    ffmpeg_details[u'stereo'] = 1
+                    ffmpeg_details['audio']+='STEREO'
+                    ffmpeg_details['stereo'] = 1
                 elif len(audio_mono.findall(data)) or len(audio_1C.findall(data)):
-                    ffmpeg_details[u'audio']+=u'MONO'
+                    ffmpeg_details['audio']+='MONO'
                 elif (len(audio_51.findall(data)) and len(audio_ac3.findall(data))) or len(audio_6C.findall(data)):
-                    ffmpeg_details[u'audio']+=u'DOLBY'
+                    ffmpeg_details['audio']+='DOLBY'
                     continue
                 elif len(audio_51.findall(data)):
-                    ffmpeg_details[u'audio']+=u'SURROUND'
+                    ffmpeg_details['audio']+='SURROUND'
 
         if ffmpeg_found == False:
             self.ffmpeg = False
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_0_3.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_0_3.py
index f5b994c862e..f1f52554142 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_0_3.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_0_3.py
@@ -229,9 +229,9 @@ def do_mythtv_check_downloading(self, line):
         downloadingItems = views.downloadingItems
         count = len(downloadingItems)
         for item in downloadingItems:
-            logging.info(u"(%s - %s) video is downloading with (%0.0f%%) complete" % (item.get_channel_title(True).replace(u'/',u'-'), item.get_title().replace(u'/',u'-'), item.download_progress()))
+            logging.info("(%s - %s) video is downloading with (%0.0f%%) complete" % (item.get_channel_title(True).replace('/','-'), item.get_title().replace('/','-'), item.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -244,33 +244,33 @@ def do_mythtv_updatewatched(self, line):
                 if item.get_filename() == video:
                      break
             else:
-                logging.info(u"Item for Miro video (%s) not found, skipping" % video)
+                logging.info("Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) marked as seen and watched" % (item.get_channel_title(True), item.get_title()))
+                logging.info("Simulation: Item (%s - %s) marked as seen and watched" % (item.get_channel_title(True), item.get_title()))
             else:
                 item.markItemSeen(markOtherItems=False)
-                self.statistics[u'Miro_marked_watch_seen']+=1
-                logging.info(u"Item (%s - %s) marked as seen and watched" % (item.get_channel_title(True), item.get_title()))
+                self.statistics['Miro_marked_watch_seen']+=1
+                logging.info("Item (%s - %s) marked as seen and watched" % (item.get_channel_title(True), item.get_title()))
 
     @run_in_event_loop
     def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
 
         self.videofiles = []
         if len(views.watchableItems):
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for item in views.watchableItems:
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 if not item.isVideo:
                     continue
                 state = item.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
                 if filetypes.is_torrent_filename(item.getURL()):
@@ -280,25 +280,25 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if len(views.watchableItems):
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
                 print "-" * 70
             for item in views.watchableItems:
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 if not item.isVideo:
                     continue
                 state = item.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
                 if filetypes.is_torrent_filename(item.getURL()):
@@ -308,15 +308,15 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     def printItems(self, item):
         if not self.verbose:
             return
         state = item.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % item.download_progress()
-        print u"%-20s %-10s %s" % (state, item.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % item.download_progress()
+        print "%-20s %-10s %s" % (state, item.get_size_for_display(),
             item.get_title())
     # end printItems()
 
@@ -330,17 +330,17 @@ def do_mythtv_item_remove(self, args):
              elif filter(self.is_not_punct_char, item.get_filename().lower()) == filter(self.is_not_punct_char, args.lower()):
                  break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if item.is_downloaded():
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) has been removed from Miro" % (item.get_channel_title(True), item.get_title()))
+                logging.info("Simulation: Item (%s - %s) has been removed from Miro" % (item.get_channel_title(True), item.get_title()))
             else:
                 item.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % item.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % item.get_title())
         else:
-            logging.info(u'%s is not downloaded' % item.get_title())
+            logging.info('%s is not downloaded' % item.get_title())
 
 
     def _get_item_dict(self, item):
@@ -351,12 +351,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -366,10 +366,10 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
-            width_height = re.compile(u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            width_height = re.compile('''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
             response = p.stdout.readline()
             if response:
@@ -379,9 +379,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -395,25 +395,25 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = item.get_channel_title(True).replace(u'/',u'-')
+        channel_title = item.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = item.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = item.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
-        item_dict =  {u'feed_id': item.feed_id, u'parent_id': item.parent_id, u'isContainerItem': item.isContainerItem, u'isVideo': item.isVideo, u'seen': item.seen, u'autoDownloaded': item.autoDownloaded, u'pendingManualDL': item.pendingManualDL, u'downloadedTime': item.downloadedTime, u'watchedTime': item.watchedTime, u'pendingReason': item.pendingReason, u'title': title,  u'expired': item.expired, u'keep': item.keep, u'videoFilename': item.get_filename(), u'eligibleForAutoDownload': item.eligibleForAutoDownload, u'duration': item.duration, u'screenshot': item.screenshot, u'resized_screenshots': item.resized_screenshots, u'resumeTime': item.resumeTime, u'channelTitle': channel_title, u'description': item.get_description(), u'size': item._get_size(), u'releasedate': item.get_release_date_obj(), u'length': item.get_duration_value(), u'channel_icon': channel_icon, u'item_icon': item_icon_filename, u'inetref': u'', u'season': 1, u'episode': 1,}
+        item_dict =  {'feed_id': item.feed_id, 'parent_id': item.parent_id, 'isContainerItem': item.isContainerItem, 'isVideo': item.isVideo, 'seen': item.seen, 'autoDownloaded': item.autoDownloaded, 'pendingManualDL': item.pendingManualDL, 'downloadedTime': item.downloadedTime, 'watchedTime': item.watchedTime, 'pendingReason': item.pendingReason, 'title': title,  'expired': item.expired, 'keep': item.keep, 'videoFilename': item.get_filename(), 'eligibleForAutoDownload': item.eligibleForAutoDownload, 'duration': item.duration, 'screenshot': item.screenshot, 'resized_screenshots': item.resized_screenshots, 'resumeTime': item.resumeTime, 'channelTitle': channel_title, 'description': item.get_description(), 'size': item._get_size(), 'releasedate': item.get_release_date_obj(), 'length': item.get_duration_value(), 'channel_icon': channel_icon, 'item_icon': item_icon_filename, 'inetref': '', 'season': 1, 'episode': 1,}
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_5_2.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_5_2.py
index 859e36f2625..dd2773a6896 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_5_2.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_5_2.py
@@ -247,9 +247,9 @@ def do_mythtv_check_downloading(self, line):
         downloadingItems = item.Item.only_downloading_view()
         count = downloadingItems.count()
         for it in downloadingItems:
-            logging.info(u"(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace(u'/',u'-'), it.get_title().replace(u'/',u'-'), it.download_progress()))
+            logging.info("(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace('/','-'), it.get_title().replace('/','-'), it.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -258,9 +258,9 @@ def do_mythtv_import_opml(self, filename):
         """Import an OPML file"""
         try:
             messages.ImportFeeds(filename).send_to_backend()
-            logging.info(u"Import of OPML file (%s) sent to Miro" % (filename))
+            logging.info("Import of OPML file (%s) sent to Miro" % (filename))
         except Exception, e:
-            logging.info(u"Import of OPML file (%s) failed, error (%s)" % (filename, e))
+            logging.info("Import of OPML file (%s) failed, error (%s)" % (filename, e))
 
     @run_in_event_loop
     def do_mythtv_updatewatched(self, line):
@@ -272,35 +272,35 @@ def do_mythtv_updatewatched(self, line):
                 if it.get_filename() == video:
                      break
             else:
-                logging.info(u"Item for Miro video (%s) not found, skipping" % video)
+                logging.info("Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.mark_item_seen(markOtherItems=True)
-                self.statistics[u'Miro_marked_watch_seen']+=1
-                logging.info(u"Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                self.statistics['Miro_marked_watch_seen']+=1
+                logging.info("Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
 
     @run_in_event_loop
     def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
         self.videofiles = []
         if item.Item.newly_downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.newly_downloaded_view():
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 #if not it.isVideo: ##### This field has been removed from an item in Miro v2.5.2
                 #    continue
                 state = it.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -308,25 +308,25 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if item.Item.downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.downloaded_view():
                 state = it.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -334,15 +334,15 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     def printItems(self, it):
         if not self.verbose:
             return
         state = it.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % it.download_progress()
-        print u"%-20s %-10s %s" % (state, it.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % it.download_progress()
+        print "%-20s %-10s %s" % (state, it.get_size_for_display(),
             it.get_title())
     # end printItems()
 
@@ -359,17 +359,17 @@ def do_mythtv_item_remove(self, args):
                 if filter(self.is_not_punct_char, it.get_filename().lower()) == filter(self.is_not_punct_char, args.lower()):
                     break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if it.is_downloaded():
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % it.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % it.get_title())
         else:
-            logging.info(u'%s is not downloaded' % it.get_title())
+            logging.info('%s is not downloaded' % it.get_title())
 
     def _get_item_dict(self, it):
         """Take an item and convert all elements into a dictionary
@@ -379,12 +379,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -394,10 +394,10 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
-            width_height = re.compile(u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            width_height = re.compile('''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
             response = p.stdout.readline()
             if response:
@@ -407,9 +407,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -418,25 +418,25 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = it.get_channel_title(True).replace(u'/',u'-')
+        channel_title = it.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = it.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = it.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
-        item_dict =  {u'feed_id': it.feed_id, u'parent_id': it.parent_id, u'isContainerItem': it.isContainerItem, u'seen': it.seen, u'autoDownloaded': it.autoDownloaded, u'pendingManualDL': it.pendingManualDL, u'downloadedTime': it.downloadedTime, u'watchedTime': it.watchedTime, u'pendingReason': it.pendingReason, u'title': title,  u'expired': it.expired, u'keep': it.keep, u'videoFilename': it.get_filename(), u'eligibleForAutoDownload': it.eligibleForAutoDownload, u'duration': it.duration, u'screenshot': it.screenshot, u'resumeTime': it.resumeTime, u'channelTitle': channel_title, u'description': it.get_description(), u'size': it._get_size(), u'releasedate': it.get_release_date_obj(), u'length': it.get_duration_value(), u'channel_icon': channel_icon, u'item_icon': item_icon_filename, u'inetref': u'', u'season': 1, u'episode': 1,}
+        item_dict =  {'feed_id': it.feed_id, 'parent_id': it.parent_id, 'isContainerItem': it.isContainerItem, 'seen': it.seen, 'autoDownloaded': it.autoDownloaded, 'pendingManualDL': it.pendingManualDL, 'downloadedTime': it.downloadedTime, 'watchedTime': it.watchedTime, 'pendingReason': it.pendingReason, 'title': title,  'expired': it.expired, 'keep': it.keep, 'videoFilename': it.get_filename(), 'eligibleForAutoDownload': it.eligibleForAutoDownload, 'duration': it.duration, 'screenshot': it.screenshot, 'resumeTime': it.resumeTime, 'channelTitle': channel_title, 'description': it.get_description(), 'size': it._get_size(), 'releasedate': it.get_release_date_obj(), 'length': it.get_duration_value(), 'channel_icon': channel_icon, 'item_icon': item_icon_filename, 'inetref': '', 'season': 1, 'episode': 1,}
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_0_0.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_0_0.py
index 541b2abeeda..44de57dd784 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_0_0.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_0_0.py
@@ -249,9 +249,9 @@ def do_mythtv_check_downloading(self, line):
         downloadingItems = item.Item.only_downloading_view()
         count = downloadingItems.count()
         for it in downloadingItems:
-            logging.info(u"(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace(u'/',u'-'), it.get_title().replace(u'/',u'-'), it.download_progress()))
+            logging.info("(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace('/','-'), it.get_title().replace('/','-'), it.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -260,9 +260,9 @@ def do_mythtv_import_opml(self, filename):
         """Import an OPML file"""
         try:
             messages.ImportFeeds(filename).send_to_backend()
-            logging.info(u"Import of OPML file (%s) sent to Miro" % (filename))
+            logging.info("Import of OPML file (%s) sent to Miro" % (filename))
         except Exception, e:
-            logging.info(u"Import of OPML file (%s) failed, error (%s)" % (filename, e))
+            logging.info("Import of OPML file (%s) failed, error (%s)" % (filename, e))
 
     @run_in_event_loop
     def do_mythtv_updatewatched(self, line):
@@ -274,35 +274,35 @@ def do_mythtv_updatewatched(self, line):
                 if it.get_filename() == video:
                      break
             else:
-                logging.info(u"Item for Miro video (%s) not found, skipping" % video)
+                logging.info("Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.mark_item_seen(markOtherItems=True)
-                self.statistics[u'Miro_marked_watch_seen']+=1
-                logging.info(u"Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                self.statistics['Miro_marked_watch_seen']+=1
+                logging.info("Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
 
     @run_in_event_loop
     def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
         self.videofiles = []
         if item.Item.newly_downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.newly_downloaded_view():
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 #if not it.isVideo: ##### This field has been removed from an item in Miro v2.5.2
                 #    continue
                 state = it.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -310,25 +310,25 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if item.Item.downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.downloaded_view():
                 state = it.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -336,15 +336,15 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     def printItems(self, it):
         if not self.verbose:
             return
         state = it.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % it.download_progress()
-        print u"%-20s %-10s %s" % (state, it.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % it.download_progress()
+        print "%-20s %-10s %s" % (state, it.get_size_for_display(),
             it.get_title())
     # end printItems()
 
@@ -361,17 +361,17 @@ def do_mythtv_item_remove(self, args):
                 if filter(self.is_not_punct_char, it.get_filename().lower()) == filter(self.is_not_punct_char, args.lower()):
                     break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if it.is_downloaded():
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % it.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % it.get_title())
         else:
-            logging.info(u'%s is not downloaded' % it.get_title())
+            logging.info('%s is not downloaded' % it.get_title())
 
     def _get_item_dict(self, it):
         """Take an item and convert all elements into a dictionary
@@ -381,12 +381,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -396,10 +396,10 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
-            width_height = re.compile(u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            width_height = re.compile('''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
             response = p.stdout.readline()
             if response:
@@ -409,9 +409,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -420,25 +420,25 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = it.get_channel_title(True).replace(u'/',u'-')
+        channel_title = it.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = it.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = it.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
-        item_dict =  {u'feed_id': it.feed_id, u'parent_id': it.parent_id, u'isContainerItem': it.isContainerItem, u'seen': it.seen, u'autoDownloaded': it.autoDownloaded, u'pendingManualDL': it.pendingManualDL, u'downloadedTime': it.downloadedTime, u'watchedTime': it.watchedTime, u'pendingReason': it.pendingReason, u'title': title,  u'expired': it.expired, u'keep': it.keep, u'videoFilename': it.get_filename(), u'eligibleForAutoDownload': it.eligibleForAutoDownload, u'duration': it.duration, u'screenshot': it.screenshot, u'resumeTime': it.resumeTime, u'channelTitle': channel_title, u'description': it.get_description(), u'size': it._get_size(), u'releasedate': it.get_release_date_obj(), u'length': it.get_duration_value(), u'channel_icon': channel_icon, u'item_icon': item_icon_filename, u'inetref': u'', u'season': 1, u'episode': 1,}
+        item_dict =  {'feed_id': it.feed_id, 'parent_id': it.parent_id, 'isContainerItem': it.isContainerItem, 'seen': it.seen, 'autoDownloaded': it.autoDownloaded, 'pendingManualDL': it.pendingManualDL, 'downloadedTime': it.downloadedTime, 'watchedTime': it.watchedTime, 'pendingReason': it.pendingReason, 'title': title,  'expired': it.expired, 'keep': it.keep, 'videoFilename': it.get_filename(), 'eligibleForAutoDownload': it.eligibleForAutoDownload, 'duration': it.duration, 'screenshot': it.screenshot, 'resumeTime': it.resumeTime, 'channelTitle': channel_title, 'description': it.get_description(), 'size': it._get_size(), 'releasedate': it.get_release_date_obj(), 'length': it.get_duration_value(), 'channel_icon': channel_icon, 'item_icon': item_icon_filename, 'inetref': '', 'season': 1, 'episode': 1,}
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_5_0.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_5_0.py
index 2a737fa8aa9..0b47af43c80 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_5_0.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_5_0.py
@@ -249,9 +249,9 @@ def do_mythtv_check_downloading(self, line):
         downloadingItems = item.Item.only_downloading_view()
         count = downloadingItems.count()
         for it in downloadingItems:
-            logging.info(u"(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace(u'/',u'-'), it.get_title().replace(u'/',u'-'), it.download_progress()))
+            logging.info("(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace('/','-'), it.get_title().replace('/','-'), it.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -260,9 +260,9 @@ def do_mythtv_import_opml(self, filename):
         """Import an OPML file"""
         try:
             messages.ImportFeeds(filename).send_to_backend()
-            logging.info(u"Import of OPML file (%s) sent to Miro" % (filename))
+            logging.info("Import of OPML file (%s) sent to Miro" % (filename))
         except Exception, e:
-            logging.info(u"Import of OPML file (%s) failed, error (%s)" % (filename, e))
+            logging.info("Import of OPML file (%s) failed, error (%s)" % (filename, e))
 
     @run_in_event_loop
     def do_mythtv_updatewatched(self, line):
@@ -273,35 +273,35 @@ def do_mythtv_updatewatched(self, line):
                 if it.get_filename() == video:
                      break
             else:
-                logging.info(u"Item for Miro video (%s) not found, skipping" % video)
+                logging.info("Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.mark_item_seen(mark_other_items=True)
-                self.statistics[u'Miro_marked_watch_seen']+=1
-                logging.info(u"Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                self.statistics['Miro_marked_watch_seen']+=1
+                logging.info("Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
 
     @run_in_event_loop
     def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
         self.videofiles = []
         if item.Item.unwatched_downloaded_items().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.unwatched_downloaded_items():
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 #if not it.isVideo: ##### This field has been removed from an item in Miro v2.5.2
                 #    continue
                 state = it.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -309,25 +309,25 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if item.Item.downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.downloaded_view():
                 state = it.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
                 self.printItems(it)
@@ -335,7 +335,7 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     ###########################################################
     # START - Function used for debugging - DO NOT UNCOMMENT
@@ -372,9 +372,9 @@ def printItems(self, it):
         if not self.verbose:
             return
         state = it.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % it.download_progress()
-        print u"%-20s %-10s %s" % (state, it.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % it.download_progress()
+        print "%-20s %-10s %s" % (state, it.get_size_for_display(),
             it.get_title())
     # end printItems()
 
@@ -391,17 +391,17 @@ def do_mythtv_item_remove(self, args):
                 if filter(self.is_not_punct_char, it.get_filename().lower()) == filter(self.is_not_punct_char, args.lower()):
                     break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if it.is_downloaded():
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % it.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % it.get_title())
         else:
-            logging.info(u'%s is not downloaded' % it.get_title())
+            logging.info('%s is not downloaded' % it.get_title())
 
     def _get_item_dict(self, it):
         """Take an item and convert all elements into a dictionary
@@ -411,12 +411,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -426,10 +426,10 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
-            width_height = re.compile(u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            width_height = re.compile('''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
             response = p.stdout.readline()
             if response:
@@ -439,9 +439,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -450,25 +450,25 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = it.get_channel_title(True).replace(u'/',u'-')
+        channel_title = it.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = it.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = it.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
-        item_dict =  {u'feed_id': it.feed_id, u'parent_id': it.parent_id, u'isContainerItem': it.isContainerItem, u'seen': it.seen, u'autoDownloaded': it.autoDownloaded, u'pendingManualDL': it.pendingManualDL, u'downloadedTime': it.downloadedTime, u'watchedTime': it.watchedTime, u'pendingReason': it.pendingReason, u'title': title,  u'expired': it.expired, u'keep': it.keep, u'videoFilename': it.get_filename(), u'eligibleForAutoDownload': it.eligibleForAutoDownload, u'duration': it.duration, u'screenshot': it.screenshot, u'resumeTime': it.resumeTime, u'channelTitle': channel_title, u'description': it.get_description(), u'size': it._get_size(), u'releasedate': it.get_release_date_obj(), u'length': it.get_duration_value(), u'channel_icon': channel_icon, u'item_icon': item_icon_filename, u'inetref': u'', u'season': 1, u'episode': 1,}
+        item_dict =  {'feed_id': it.feed_id, 'parent_id': it.parent_id, 'isContainerItem': it.isContainerItem, 'seen': it.seen, 'autoDownloaded': it.autoDownloaded, 'pendingManualDL': it.pendingManualDL, 'downloadedTime': it.downloadedTime, 'watchedTime': it.watchedTime, 'pendingReason': it.pendingReason, 'title': title,  'expired': it.expired, 'keep': it.keep, 'videoFilename': it.get_filename(), 'eligibleForAutoDownload': it.eligibleForAutoDownload, 'duration': it.duration, 'screenshot': it.screenshot, 'resumeTime': it.resumeTime, 'channelTitle': channel_title, 'description': it.get_description(), 'size': it._get_size(), 'releasedate': it.get_release_date_obj(), 'length': it.get_duration_value(), 'channel_icon': channel_icon, 'item_icon': item_icon_filename, 'inetref': '', 'season': 1, 'episode': 1,}
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py
index 966d184677d..1df23a006d6 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py
@@ -223,9 +223,9 @@ def do_mythtv_check_downloading(self, line):
         downloadingItems = item.Item.only_downloading_view()
         count = downloadingItems.count()
         for it in downloadingItems:
-            logging.info(u"(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace(u'/',u'-'), it.get_title().replace(u'/',u'-'), it.download_progress()))
+            logging.info("(%s - %s) video is downloading with (%0.0f%%) complete" % (it.get_channel_title(True).replace('/','-'), it.get_title().replace('/','-'), it.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -234,9 +234,9 @@ def do_mythtv_import_opml(self, filename):
         """Import an OPML file"""
         try:
             messages.ImportFeeds(filename).send_to_backend()
-            logging.info(u"Import of OPML file (%s) sent to Miro" % (filename))
+            logging.info("Import of OPML file (%s) sent to Miro" % (filename))
         except Exception, e:
-            logging.info(u"Import of OPML file (%s) failed, error (%s)" % (filename, e))
+            logging.info("Import of OPML file (%s) failed, error (%s)" % (filename, e))
 
     @run_in_event_loop
     def do_mythtv_updatewatched(self, line):
@@ -247,43 +247,43 @@ def do_mythtv_updatewatched(self, line):
                 if it.get_filename() == video:
                      break
             else:
-                logging.info(u"Item for Miro video (%s) not found, skipping" % video)
+                logging.info("Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.mark_item_seen(mark_other_items=True)
-                self.statistics[u'Miro_marked_watch_seen']+=1
-                logging.info(u"Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
+                self.statistics['Miro_marked_watch_seen']+=1
+                logging.info("Item (%s - %s) marked as seen and watched" % (it.get_channel_title(True), it.get_title()))
 
     @run_in_event_loop
     def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
         self.videofiles = []
         if item.Item.unwatched_downloaded_items().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.unwatched_downloaded_items():
                 # Skip any audio file as MythTV Internal player may abort the MythTV Frontend on a MP3
                 #if not it.isVideo: ##### This field has been removed from an item in Miro v2.5.2
                 #    continue
                 state = it.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
 
                 # Any item without a proper file name needs to be removed as Miro metadata is corrupt
                 if it.get_filename() is None:
                     it.expire()
-                    self.statistics[u'Miro_videos_deleted']+=1
-                    logging.info(u'Unwatched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
+                    self.statistics['Miro_videos_deleted']+=1
+                    logging.info('Unwatched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
                     continue
 
                 self.printItems(it)
@@ -291,33 +291,33 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if item.Item.downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.downloaded_view():
                 state = it.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
 
                 # Any item without a proper file name needs to be removed as Miro metadata is corrupt
                 if it.get_filename() is None:
                     it.expire()
-                    self.statistics[u'Miro_videos_deleted']+=1
-                    logging.info(u'Watched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
+                    self.statistics['Miro_videos_deleted']+=1
+                    logging.info('Watched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
                     continue
 
                 self.printItems(it)
@@ -325,7 +325,7 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     ###########################################################
     # START - Function used for debugging - DO NOT UNCOMMENT
@@ -362,9 +362,9 @@ def printItems(self, it):
         if not self.verbose:
             return
         state = it.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % it.download_progress()
-        print u"%-20s %-10s %s" % (state, it.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % it.download_progress()
+        print "%-20s %-10s %s" % (state, it.get_size_for_display(),
             it.get_title())
     # end printItems()
 
@@ -381,17 +381,17 @@ def do_mythtv_item_remove(self, args):
                 if filter(self.is_not_punct_char, it.get_filename().lower()) == filter(self.is_not_punct_char, args.lower()):
                     break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if it.is_downloaded():
             if self.simulation:
-                logging.info(u"Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
+                logging.info("Simulation: Item (%s - %s) has been removed from Miro" % (it.get_channel_title(True), it.get_title()))
             else:
                 it.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % it.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % it.get_title())
         else:
-            logging.info(u'%s is not downloaded' % it.get_title())
+            logging.info('%s is not downloaded' % it.get_title())
 
     def _get_item_dict(self, it):
         """Take an item and convert all elements into a dictionary
@@ -401,12 +401,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -416,10 +416,10 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
-            width_height = re.compile(u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+            width_height = re.compile('''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot), shell=True, bufsize=4096, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 
             response = p.stdout.readline()
             if response:
@@ -429,9 +429,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -440,25 +440,25 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = it.get_channel_title(True).replace(u'/',u'-')
+        channel_title = it.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = it.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = it.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
-        item_dict =  {u'feed_id': it.feed_id, u'parent_id': it.parent_id, u'isContainerItem': it.isContainerItem, u'seen': it.seen, u'autoDownloaded': it.autoDownloaded, u'pendingManualDL': it.pendingManualDL, u'downloadedTime': it.downloadedTime, u'watchedTime': it.watchedTime, u'pendingReason': it.pendingReason, u'title': title,  u'expired': it.expired, u'keep': it.keep, u'videoFilename': it.get_filename(), u'eligibleForAutoDownload': it.eligibleForAutoDownload, u'duration': it.duration, u'screenshot': it.screenshot, u'resumeTime': it.resumeTime, u'channelTitle': channel_title, u'description': it.get_description(), u'size': it._get_size(), u'releasedate': it.get_release_date(), u'length': it.get_duration_value(), u'channel_icon': channel_icon, u'item_icon': item_icon_filename, u'inetref': u'', u'season': 1, u'episode': 1,}
+        item_dict =  {'feed_id': it.feed_id, 'parent_id': it.parent_id, 'isContainerItem': it.isContainerItem, 'seen': it.seen, 'autoDownloaded': it.autoDownloaded, 'pendingManualDL': it.pendingManualDL, 'downloadedTime': it.downloadedTime, 'watchedTime': it.watchedTime, 'pendingReason': it.pendingReason, 'title': title,  'expired': it.expired, 'keep': it.keep, 'videoFilename': it.get_filename(), 'eligibleForAutoDownload': it.eligibleForAutoDownload, 'duration': it.duration, 'screenshot': it.screenshot, 'resumeTime': it.resumeTime, 'channelTitle': channel_title, 'description': it.get_description(), 'size': it._get_size(), 'releasedate': it.get_release_date(), 'length': it.get_duration_value(), 'channel_icon': channel_icon, 'item_icon': item_icon_filename, 'inetref': '', 'season': 1, 'episode': 1,}
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_6_0_0.py b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_6_0_0.py
index 2282722e972..78305c90ec7 100644
--- a/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_6_0_0.py
+++ b/mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_6_0_0.py
@@ -226,11 +226,11 @@ def do_mythtv_check_downloading(self, line):
         count = downloadingItems.count()
         for it in downloadingItems:
             logging.info(
-            u"(%s - %s) video is downloading with (%0.0f%%) complete" % (
-                it.get_channel_title(True).replace(u'/',u'-'),
-                it.get_title().replace(u'/',u'-'), it.download_progress()))
+            "(%s - %s) video is downloading with (%0.0f%%) complete" % (
+                it.get_channel_title(True).replace('/','-'),
+                it.get_title().replace('/','-'), it.download_progress()))
         if not count:
-            logging.info(u"No items downloading")
+            logging.info("No items downloading")
         if count:
             self.downloading = True
 
@@ -240,10 +240,10 @@ def do_mythtv_import_opml(self, filename):
         try:
             messages.ImportFeeds(filename).send_to_backend()
             logging.info(
-                u"Import of OPML file (%s) sent to Miro" % (filename))
+                "Import of OPML file (%s) sent to Miro" % (filename))
         except Exception, e:
             logging.info(
-                u"Import of OPML file (%s) failed, error (%s)" % (filename, e))
+                "Import of OPML file (%s) failed, error (%s)" % (filename, e))
 
     @run_in_event_loop
     def do_mythtv_updatewatched(self, line):
@@ -255,17 +255,17 @@ def do_mythtv_updatewatched(self, line):
                      break
             else:
                 logging.info(
-                    u"Item for Miro video (%s) not found, skipping" % video)
+                    "Item for Miro video (%s) not found, skipping" % video)
                 continue
             if self.simulation:
                 logging.info(
-                    u"Simulation: Item (%s - %s) marked as seen and watched" % (
+                    "Simulation: Item (%s - %s) marked as seen and watched" % (
                     it.get_channel_title(True), it.get_title()))
             else:
                 it.mark_watched(mark_other_items=True)
-                self.statistics[u'Miro_marked_watch_seen']+=1
+                self.statistics['Miro_marked_watch_seen']+=1
                 logging.info(
-                    u"Item (%s - %s) marked as seen and watched" % (
+                    "Item (%s - %s) marked as seen and watched" % (
                     it.get_channel_title(True), it.get_title()))
 
     @run_in_event_loop
@@ -273,20 +273,20 @@ def do_mythtv_getunwatched(self, line):
         """Process MythTV get all un-watched video details"""
         if self.verbose:
              print
-             print u"Getting details on un-watched Miro videos"
+             print "Getting details on un-watched Miro videos"
         self.videofiles = []
         if item.Item.unwatched_downloaded_items().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.unwatched_downloaded_items():
                 # Skip any audio file as MythTV Internal player may abort
                 # the MythTV Frontend on a MP3
                 state = it.get_state()
-                if not state == u'newly-downloaded':
+                if not state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
 
@@ -294,9 +294,9 @@ def do_mythtv_getunwatched(self, line):
                 # as Miro metadata is corrupt
                 if it.get_filename() is None:
                     it.expire()
-                    self.statistics[u'Miro_videos_deleted']+=1
+                    self.statistics['Miro_videos_deleted']+=1
                     logging.info(
-u'Unwatched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
+'Unwatched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
                     continue
 
                 self.printItems(it)
@@ -304,34 +304,34 @@ def do_mythtv_getunwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No un-watched Miro videos")
+             logging.info("No un-watched Miro videos")
 
     @run_in_event_loop
     def do_mythtv_getwatched(self, line):
         """Process MythTV get all watched/saved video details"""
         if self.verbose:
            print
-           print u"Getting details on watched/saved Miro videos"
+           print "Getting details on watched/saved Miro videos"
         self.videofiles = []
         if item.Item.downloaded_view().count():
             if self.verbose:
-                print u"%-20s %-10s %s" % (u"State", u"Size", u"Name")
-                print u"-" * 70
+                print "%-20s %-10s %s" % ("State", "Size", "Name")
+                print "-" * 70
             for it in item.Item.downloaded_view():
                 state = it.get_state()
-                if state == u'newly-downloaded':
+                if state == 'newly-downloaded':
                     continue
                 # Skip any bittorrent video downloads for legal concerns
-                if hasattr(it.get_parent(), u'url'):
+                if hasattr(it.get_parent(), 'url'):
                     if filetypes.is_torrent_filename(it.get_parent().url):
                         continue
 
                 # Any item without a proper file name needs to be removed as Miro metadata is corrupt
                 if it.get_filename() is None:
                     it.expire()
-                    self.statistics[u'Miro_videos_deleted']+=1
+                    self.statistics['Miro_videos_deleted']+=1
                     logging.info(
-u'Watched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
+'Watched video (%s) has been removed from Miro as item had no valid file name' % it.get_title())
                     continue
 
                 self.printItems(it)
@@ -339,7 +339,7 @@ def do_mythtv_getwatched(self, line):
             if self.verbose:
                 print
         if not len(self.videofiles):
-             logging.info(u"No watched/saved Miro videos")
+             logging.info("No watched/saved Miro videos")
 
     ###########################################################
     # START - Function used for debugging - DO NOT UNCOMMENT
@@ -376,9 +376,9 @@ def printItems(self, it):
         if not self.verbose:
             return
         state = it.get_state()
-        if state == u'downloading':
-            state += u' (%0.0f%%)' % it.download_progress()
-        print u"%-20s %-10s %s" % (state, it.get_size_for_display(),
+        if state == 'downloading':
+            state += ' (%0.0f%%)' % it.download_progress()
+        print "%-20s %-10s %s" % (state, it.get_size_for_display(),
             it.get_title())
     # end printItems()
 
@@ -403,19 +403,19 @@ def do_mythtv_item_remove(self, args):
                             self.is_not_punct_char, args.lower()):
                     break
         else:
-            logging.info(u"No item named %s" % args)
+            logging.info("No item named %s" % args)
             return
         if it.is_downloaded():
             if self.simulation:
                 logging.info(
-u"Simulation: Item (%s - %s) has been removed from Miro" % (
+"Simulation: Item (%s - %s) has been removed from Miro" % (
                         it.get_channel_title(True), it.get_title()))
             else:
                 it.expire()
-                self.statistics[u'Miro_videos_deleted']+=1
-                logging.info(u'%s has been removed from Miro' % it.get_title())
+                self.statistics['Miro_videos_deleted']+=1
+                logging.info('%s has been removed from Miro' % it.get_title())
         else:
-            logging.info(u'%s is not downloaded' % it.get_title())
+            logging.info('%s is not downloaded' % it.get_title())
 
     def _get_item_dict(self, it):
         """Take an item and convert all elements into a dictionary
@@ -425,12 +425,12 @@ def compatibleGraphics(filename):
             if filename:
                 (dirName, fileName) = os.path.split(filename)
                 (fileBaseName, fileExtension)=os.path.splitext(fileName)
-                if not fileExtension[1:] in [u"png", u"jpg", u"bmp", u"gif"]:
-                    return u''
+                if not fileExtension[1:] in ["png", "jpg", "bmp", "gif"]:
+                    return ''
                 else:
                     return filename
             else:
-                return u''
+                return ''
 
         def useImageMagick(screenshot):
             """ Using ImageMagick's utility 'identify'. Decide whether the screen shot is worth using.
@@ -440,11 +440,11 @@ def useImageMagick(screenshot):
             >>> screenshot if the quality is good enough to use
             """
             if not self.imagemagick: # If imagemagick is not installed do not bother checking
-               return u''
+               return ''
 
             width_height = re.compile(
-u'''^(.+?)[ ]\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
-            p = subprocess.Popen(u'identify "%s"' % (screenshot),
+'''^(.+?)[ ]\\[?([0-9]+)x([0-9]+)[^\\/]*$''', re.UNICODE)
+            p = subprocess.Popen('identify "%s"' % (screenshot),
                                 shell=True, bufsize=4096,
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
@@ -458,9 +458,9 @@ def useImageMagick(screenshot):
                     width, height = int(width), int(height)
                     if width >= 320:
                         return screenshot
-                return u''
+                return ''
             else:
-                return u''
+                return ''
             return screenshot
         # end useImageMagick()
 
@@ -469,49 +469,49 @@ def useImageMagick(screenshot):
 
         # Conform to maximum length for MythTV database fields title and subtitle
         maximum_length = 128
-        channel_title = it.get_channel_title(True).replace(u'/',u'-')
+        channel_title = it.get_channel_title(True).replace('/','-')
         if channel_title:
             if len(channel_title) > maximum_length:
                 channel_title = channel_title[:maximum_length]
-            channel_title = channel_title.replace(u'"', u'')	# These characters mess with filenames
-        title = it.get_title().replace(u'/',u'-')
+            channel_title = channel_title.replace('"', '')	# These characters mess with filenames
+        title = it.get_title().replace('/','-')
         if title:
             if len(title) > maximum_length:
                 title = title[:maximum_length]
-            title = title.replace(u'"', u'')	# These characters mess with filenames
-            title = title.replace(u"'", u'')	# These characters mess with filenames
+            title = title.replace('"', '')	# These characters mess with filenames
+            title = title.replace("'", '')	# These characters mess with filenames
 
         item_dict =  {
-            u'feed_id': it.feed_id, u'parent_id': it.parent_id,
-            u'isContainerItem': it.is_container_item,
-            u'seen': it.get_state(),
-            u'autoDownloaded': it.auto_downloaded,
-            u'pendingManualDL': it.pending_manual_download,
-            u'downloadedTime': it.downloaded_time,
-            u'watchedTime': it.watched_time,
-            u'pendingReason': it.pending_reason,
-            u'title': title,
-            u'expired': it.expired,
-            u'keep': it.keep, u'videoFilename': it.get_filename(),
-            u'eligibleForAutoDownload': it.eligible_for_autodownload,
-            u'duration': it.duration,
-            u'screenshot': it.screenshot,
-            u'resumeTime': it.resume_time,
-            u'channelTitle': channel_title,
-            u'description': it.get_description(),
-            u'size': it.get_size(),
-            u'releasedate': it.get_release_date(),
-            u'length': it.get_duration_value(),
-            u'channel_icon': channel_icon,
-            u'item_icon': item_icon_filename,
-            u'inetref': u'', u'season': 1, u'episode': 1,
+            'feed_id': it.feed_id, 'parent_id': it.parent_id,
+            'isContainerItem': it.is_container_item,
+            'seen': it.get_state(),
+            'autoDownloaded': it.auto_downloaded,
+            'pendingManualDL': it.pending_manual_download,
+            'downloadedTime': it.downloaded_time,
+            'watchedTime': it.watched_time,
+            'pendingReason': it.pending_reason,
+            'title': title,
+            'expired': it.expired,
+            'keep': it.keep, 'videoFilename': it.get_filename(),
+            'eligibleForAutoDownload': it.eligible_for_autodownload,
+            'duration': it.duration,
+            'screenshot': it.screenshot,
+            'resumeTime': it.resume_time,
+            'channelTitle': channel_title,
+            'description': it.get_description(),
+            'size': it.get_size(),
+            'releasedate': it.get_release_date(),
+            'length': it.get_duration_value(),
+            'channel_icon': channel_icon,
+            'item_icon': item_icon_filename,
+            'inetref': '', 'season': 1, 'episode': 1,
         }
 
-        if not item_dict[u'screenshot']:
-            if item_dict[u'item_icon']:
-                item_dict[u'screenshot'] = useImageMagick(item_dict[u'item_icon'])
+        if not item_dict['screenshot']:
+            if item_dict['item_icon']:
+                item_dict['screenshot'] = useImageMagick(item_dict['item_icon'])
 
-        for key in [u'screenshot', u'channel_icon', u'item_icon']:
+        for key in ['screenshot', 'channel_icon', 'item_icon']:
             if item_dict[key]:
                 item_dict[key] = compatibleGraphics(item_dict[key])
             #if self.verbose:
diff --git a/mythtv/external/FFmpeg/tools/python/convert_from_tensorflow.py b/mythtv/external/FFmpeg/tools/python/convert_from_tensorflow.py
index 38e64c1c941..321b89c381b 100644
--- a/mythtv/external/FFmpeg/tools/python/convert_from_tensorflow.py
+++ b/mythtv/external/FFmpeg/tools/python/convert_from_tensorflow.py
@@ -24,7 +24,7 @@
 
 __all__ = ['convert_from_tensorflow']
 
-class Operand(object):
+class Operand:
     IOTYPE_INPUT = 1
     IOTYPE_OUTPUT = 2
     IOTYPE_INTERMEDIATE = IOTYPE_INPUT | IOTYPE_OUTPUT
diff --git a/mythtv/html/translation-util.py b/mythtv/html/translation-util.py
index b2f91c201a4..bd073a66496 100755
--- a/mythtv/html/translation-util.py
+++ b/mythtv/html/translation-util.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-# -*- coding: utf-8 -*-
 #
 # Python script to check, add, remove, amend strings in the translation JSON files
 # used by the Angular MythTV webapp
@@ -407,7 +406,7 @@ def listKeys(lang):
 def listLanguages():
     print("The listkeys command supports these language codes:-")
     for code,file,name in DEST_LANGS:
-        print("    {0:6}  {1}".format(code,name))
+        print("    {:6}  {}".format(code,name))
 
 if __name__ == '__main__':
 
diff --git a/mythtv/programs/scripts/build_compdb.py b/mythtv/programs/scripts/build_compdb.py
index 2a59500fdd7..8dc4063e167 100755
--- a/mythtv/programs/scripts/build_compdb.py
+++ b/mythtv/programs/scripts/build_compdb.py
@@ -22,18 +22,18 @@
     badnames = ["/external/", "moc_", "dummy.o.json"]
     if any(bad in filename for bad in badnames):
         if options.verbose:
-            print("Skipping input file: {0:s}".format(path.as_posix()))
+            print("Skipping input file: {:s}".format(path.as_posix()))
         continue
-    in_file = open(path, "r")
+    in_file = open(path)
     if not in_file:
         if options.verbose:
-            print("Cannot open input file: {0:s}".format(filename))
+            print("Cannot open input file: {:s}".format(filename))
         continue
 
     # Read and strip trailing comma
     rawcontent = in_file.read()
     if len(rawcontent) < 2:
-        print("Bad file contents: {0:s}".format(filename))
+        print("Bad file contents: {:s}".format(filename))
         exit(1)
     content = json.loads(rawcontent[:-2])
     in_file.close()
@@ -41,16 +41,16 @@
     # Manipulate file names
     if content["file"].startswith("../") and not content["file"].endswith("Json.cpp"):
         if options.verbose:
-            print("Skipping input file2: {0:s}".format(filename))
+            print("Skipping input file2: {:s}".format(filename))
         continue
     content["file"] = content["directory"] + "/" + content["file"]
 
     # Save the output for this file
     if options.verbose:
-        print("Including input file: {0:s}".format(path.as_posix()))
+        print("Including input file: {:s}".format(path.as_posix()))
     outlines.append(json.dumps(content, indent=4))
 
 # Dump out the compdb file
 out_file = open("../compile_commands.json", "w")
-print("[\n{0:s}\n]".format(",\n".join(outlines)), file=out_file)
+print("[\n{:s}\n]".format(",\n".join(outlines)), file=out_file)
 out_file.close()
diff --git a/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py b/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py
index 51619096b80..534a83b51f8 100644
--- a/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py
+++ b/mythtv/programs/scripts/hardwareprofile/MultipartPostHandler.py
@@ -39,11 +39,7 @@
   The main function of this file is a sample which downloads a page and
   then uploads it to the W3C validator.
 """
-from __future__ import print_function
 
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 from email.generator import _make_boundary
 import mimetypes
 import os, stat
@@ -63,7 +59,7 @@
     import urllib.parse as ulib
 
 
-class Callable(object):
+class Callable:
     def __init__(self, anycallable):
         self.__call__ = anycallable
 
diff --git a/mythtv/programs/scripts/hardwareprofile/config.py b/mythtv/programs/scripts/hardwareprofile/config.py
index 46da6641611..90ebdc3f784 100644
--- a/mythtv/programs/scripts/hardwareprofile/config.py
+++ b/mythtv/programs/scripts/hardwareprofile/config.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import os, re, sys
 from subprocess import Popen, PIPE
 import os_detect
diff --git a/mythtv/programs/scripts/hardwareprofile/deleteProfile.py b/mythtv/programs/scripts/hardwareprofile/deleteProfile.py
index 899f2a0037d..be209bb7b28 100755
--- a/mythtv/programs/scripts/hardwareprofile/deleteProfile.py
+++ b/mythtv/programs/scripts/hardwareprofile/deleteProfile.py
@@ -19,8 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
-from builtins import str
 import sys
 import requests
 from optparse import OptionParser
diff --git a/mythtv/programs/scripts/hardwareprofile/devicelist.py b/mythtv/programs/scripts/hardwareprofile/devicelist.py
index 7c6432e35ce..375dd898488 100644
--- a/mythtv/programs/scripts/hardwareprofile/devicelist.py
+++ b/mythtv/programs/scripts/hardwareprofile/devicelist.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2010 Mike McGrath <mmcgrath@redhat.com>
@@ -18,7 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from builtins import object
 import os
 from hwdata import DeviceMap
 
@@ -93,7 +90,7 @@
                 'subsystem_device']
 
 def cat(file_name):
-    fd = open(file_name, 'r')
+    fd = open(file_name)
     results = fd.readlines()
     fd.close()
     return results
@@ -118,11 +115,11 @@ def device_factory(cls, id):
         device.process()
     except OSError:
         pass
-    except IOError:
+    except OSError:
         pass
     return device
 
-class Device( object ):
+class Device:
     bus = 'Unknown'
     def __init__(self, id):
         self.id             = id
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/distro.py b/mythtv/programs/scripts/hardwareprofile/distros/distro.py
index b5ac8a0c862..a3bac89372b 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/distro.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/distro.py
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from builtins import object
-class Distro(object):
+class Distro:
     def _raise_abstract(self):
         raise Exception('Function must be overwritten.')
 
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
index 3afc51481c7..a1cb625a71a 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2011 Raymond Wagner <raymond@wagnerrp.com>
@@ -19,10 +18,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-from __future__ import division
-from __future__ import print_function
-from builtins import range
-from builtins import object
 from past.utils import old_div
 import os
 import re
@@ -39,7 +34,7 @@
 _SETTINGS = _DB.settings[_DB.gethostname()]
 prefix = 'mythtv'
 
-class _Mythtv_data(object):
+class _Mythtv_data:
     def __init__(self, gate):
         self.get_data(gate)
 
@@ -162,8 +157,8 @@ class CaptureCard( MythTV.database.DBData ): pass
         class VideoSource( MythTV.database.DBData ): pass
 
         data = OrdDict()
-        usedsources = list(set([inp.sourceid for inp in CaptureCard.getAllEntries()]))
-        grabbers = list(set([VideoSource(id).xmltvgrabber for id in usedsources]))
+        usedsources = list({inp.sourceid for inp in CaptureCard.getAllEntries()})
+        grabbers = list({VideoSource(id).xmltvgrabber for id in usedsources})
         data.sourcecount = len(usedsources)
         data.grabbers = grabbers
         return data
@@ -208,7 +203,7 @@ def processdirs(paths):
         sgnames  = list(set(sgnames))
 
         sgs = []
-        for host in set([_DB.gethostname(), _BE.hostname]):
+        for host in {_DB.gethostname(), _BE.hostname}:
             for sgname in sgnames:
                 for sg in _DB.getStorageGroup(sgname, host):
                     if sg.local:
@@ -229,7 +224,7 @@ def _bool(val):
         def _read_file(filename):
             firstline=[]
             try:
-                with open(filename,'r') as f:
+                with open(filename) as f:
                         line = f.readline()
                         firstline = line.split()
             except:
@@ -308,7 +303,7 @@ def ProcessVideoProfile(self):
         class DisplayProfileGroups( MythTV.database.DBData ): pass
         class DisplayProfiles( OrdDict ):
             def __new__(cls, *args, **kwargs):
-                inst = super(DisplayProfiles, cls).__new__(cls, *args, **kwargs)
+                inst = super().__new__(cls, *args, **kwargs)
                 inst.__dict__['_profilegroupid'] = None
                 inst.__dict__['_profileid'] = None
                 inst.__dict__['_db'] = None
@@ -387,7 +382,7 @@ def stddev(data):
         data.place_avg = 0
         data.place_stddev = 0
 
-        r = re.compile('Scheduled ([0-9]*) items in [0-9.]* = ([0-9.]*) match \+ ([0-9.]*) place')
+        r = re.compile(r'Scheduled ([0-9]*) items in [0-9.]* = ([0-9.]*) match \+ ([0-9.]*) place')
         data = OrdDict()
 
         c = _DB.cursor()
@@ -438,7 +433,7 @@ class CaptureCard( MythTV.database.DBData ): pass
                 else:
                     virtual[1] += isvirt
 
-        data = {'tuners':dict([(k,len(v)) for k,v in list(cardtypes.items())])}
+        data = {'tuners':{k:len(v) for k,v in list(cardtypes.items())}}
         if virtual[0]:
             data['vtpertuner'] = old_div(sum(virtual),float(virtual[0]))
         return data
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/main.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/main.py
index d18d235a64f..7e089a7f22e 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/main.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/main.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2009 Sebastian Pipping <sebastian@pipping.org>
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/makeopts.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/makeopts.py
index 3f06a866d33..39faacd28ec 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/makeopts.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/makeopts.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2009 Sebastian Pipping <sebastian@pipping.org>
@@ -17,8 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from builtins import str
-from builtins import object
 import re
 import portage
 
@@ -26,7 +23,7 @@
 LONG_PARA_PATTERN = '--\\S+|--\\S+=\\S+'
 PARA_PATTERN = re.compile('(%s|%s)\\b' % (SHORT_PARA_PATTERN, LONG_PARA_PATTERN))
 
-class MakeOpts(object):
+class MakeOpts:
     def __init__(self, value=None):
         """
         >>> m = MakeOpts("-C dir -f file -I dir -o file -W file -j 3 -l 4 -j -j3 -l --always-make")
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/orddict.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/orddict.py
index 800d30ee8b4..8f8ef328943 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/orddict.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/orddict.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2011 Raymond Wagner <raymond@wagnerrp.com>
@@ -17,9 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from builtins import zip
-from builtins import map
-from builtins import str
 __doc__="""This is an ordered dictionary implementation to be used to
 store client data before transmission to the server."""
 
@@ -34,13 +30,13 @@ class OrdDict( dict ):
     """
 
     def __new__(cls, *args, **kwargs):
-        inst = super(OrdDict, cls).__new__(cls, *args, **kwargs)
+        inst = super().__new__(cls, *args, **kwargs)
         inst.__dict__['_field_order'] = []
         return inst
 
     def __getattr__(self, name):
         try:
-            return super(OrdDict, self).__getattr__(name)
+            return super().__getattr__(name)
         except AttributeError:
             try:
                 return self[name]
@@ -49,23 +45,23 @@ def __getattr__(self, name):
 
     def __setattr__(self, name, value):
         if name in self.__dict__:
-            super(OrdDict, self).__setattr__(name, value)
+            super().__setattr__(name, value)
         else:
             self[name] = value
 
     def __delattr__(self, name):
         try:
-            super(OrdDict, self).__delattr__(name)
+            super().__delattr__(name)
         except AttributeError:
             del self[name]
 
     def __setitem__(self, name, value):
         if name not in self:
             self._field_order.append(name)
-        super(OrdDict, self).__setitem__(name, value)
+        super().__setitem__(name, value)
 
     def __delitem__(self, name):
-        super(OrdDict, self).__delitem__(name)
+        super().__delitem__(name)
         self._field_order.remove(key)
 
     def update(self, *data, **kwdata):
@@ -116,7 +112,7 @@ def copy(self):
         return c
 
     def clear(self):
-        super(OrdDict, self).clear()
+        super().clear()
         self._field_order = []
 
 # This sets up a factory for urllib2.Request objects, automatically
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py
index 2ae4fd3fdda..746495876b5 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2011 Raymond Wagner <sebastian@pipping.org>
@@ -21,9 +20,6 @@
 # providing the base url, user agent, and proxy information.
 # The object returned is slightly modified, with a shortcut to urlopen.
 
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 import urllib.request, urllib.error, urllib.parse
 import urllib.parse
 
@@ -34,7 +30,7 @@ def open(self):
             return urllib.request.urlopen(self, None, self.timeout)
         return urllib.request.urlopen(self)
 
-class _RequestFactory( object ):
+class _RequestFactory:
     def __init__(self, baseurl, user_agent, timeout, proxy):
         self.base_url = baseurl
         self.user_agent = user_agent
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/uuiddb.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/uuiddb.py
index 6960f8705ae..561e1cb984d 100644
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/uuiddb.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/uuiddb.py
@@ -16,11 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from future import standard_library
-standard_library.install_aliases()
-from builtins import map
-from builtins import str
-from builtins import object
 import configparser
 import logging
 import os , sys
@@ -48,7 +43,7 @@ def __init__(self, message):
     def __str__(self):
         return str(self.msg)
 
-class _UuidDb(object):
+class _UuidDb:
     hw_uuid = None
 
     def __init__(self, database_filename):
@@ -100,7 +95,7 @@ def gen_uuid(self):
             with open('/proc/sys/kernel/random/uuid') as rand_uuid:
                 rand_uuid_string = rand_uuid.read().strip()
                 return rand_uuid_string
-        except IOError:
+        except OSError:
             try:
                 import uuid
                 return uuid.uuid4()
@@ -114,7 +109,7 @@ def get_priv_uuid(self):
         try:
             with open(self.hw_uuid_file) as hwuuidfile:
                 self.hw_uuid = hwuuidfile.read().strip()
-        except IOError:
+        except OSError:
             try:
                 self.hw_uuid = self.genUUID()
             except UUIDError:
diff --git a/mythtv/programs/scripts/hardwareprofile/fs_util.py b/mythtv/programs/scripts/hardwareprofile/fs_util.py
index 7442cca6ede..c79be4a87c8 100644
--- a/mythtv/programs/scripts/hardwareprofile/fs_util.py
+++ b/mythtv/programs/scripts/hardwareprofile/fs_util.py
@@ -20,7 +20,6 @@
 # with the express permission of Red Hat, Inc.
 #
 
-from builtins import object
 import os
 
 # We cache the contents of /etc/mtab ... the following variables are used
@@ -28,7 +27,7 @@
 mtab_mtime = None
 mtab_map = []
 
-class MntEntObj(object):
+class MntEntObj:
     mnt_fsname = None #* name of mounted file system */
     mnt_dir = None    #* file system path prefix */
     mnt_type = None   #* mount type (see mntent.h) */
@@ -48,7 +47,7 @@ def __str__(self):
         return "%s %s %s %s %s %s" % (self.mnt_fsname, self.mnt_dir, self.mnt_type, \
                                       self.mnt_opts, self.mnt_freq, self.mnt_passno)
 
-class FileSystem(object):
+class FileSystem:
     def __init__(self, mntent):
         self.mnt_dev = mntent.mnt_fsname
         self.mnt_pnt = mntent.mnt_dir
diff --git a/mythtv/programs/scripts/hardwareprofile/gate.py b/mythtv/programs/scripts/hardwareprofile/gate.py
index 2ca0f522bda..9f3d2cafb62 100644
--- a/mythtv/programs/scripts/hardwareprofile/gate.py
+++ b/mythtv/programs/scripts/hardwareprofile/gate.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2009 Sebastian Pipping <sebastian@pipping.org>
@@ -17,14 +16,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from builtins import str
-from builtins import object
 import configparser
 import os
 import logging
 
 
-class _GateBase(object):
+class _GateBase:
     def process(self, data_set, value_if_granted, value_else):
         if self.grants(data_set):
             return value_if_granted
diff --git a/mythtv/programs/scripts/hardwareprofile/getLink.py b/mythtv/programs/scripts/hardwareprofile/getLink.py
index 0bb957d4304..72d444104cb 100644
--- a/mythtv/programs/scripts/hardwareprofile/getLink.py
+++ b/mythtv/programs/scripts/hardwareprofile/getLink.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 ### This module isn't used anywhere in the MythTV repository.
 
 # smolt - Fedora hardware profiler
@@ -21,7 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
 import sys
 from optparse import OptionParser
 import requests
diff --git a/mythtv/programs/scripts/hardwareprofile/hwdata.py b/mythtv/programs/scripts/hardwareprofile/hwdata.py
index ba297bf24f5..63f30a23fd2 100644
--- a/mythtv/programs/scripts/hardwareprofile/hwdata.py
+++ b/mythtv/programs/scripts/hardwareprofile/hwdata.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2010 Mike McGrath <mmcgrath@redhat.com>
@@ -19,31 +17,22 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from builtins import int
-from builtins import open
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 from smolt_config import get_config_attr
 
-class myVendor(object):
+class myVendor:
     def __init__(self):
         self.name = ""
         self.num = ""
         self.devices = {}
 
-class myDevice(object):
+class myDevice:
     def __init__(self):
         self.name = ""
         self.num = ""
         self.subvendors = {}
         self.vendor = ""
 
-class DeviceMap(object):
+class DeviceMap:
     vendors = {}
 
     def __init__(self, bus='pci'):
@@ -61,19 +50,19 @@ def device_map(self, bus='pci'):
                     # File isn't in the default python3 UTF-8, using latin1
                     fo = gzip.open(fn + ".gz", 'rt', encoding='latin1')
                     break
-                except IOError:
+                except OSError:
                     pass
             else:
                 try:
-                    fo = open(fn, 'rt', encoding='latin1')
+                    fo = open(fn, encoding='latin1')
                     break
-                except IOError:
+                except OSError:
                     pass
         else:
             raise Exception('Hardware data file not found.  Please set the location HWDATA_DIR in config.py')
-         
-            
-            
+
+
+
         vendors = {}
         curvendor = None
         curdevice = None
diff --git a/mythtv/programs/scripts/hardwareprofile/i18n.py b/mythtv/programs/scripts/hardwareprofile/i18n.py
index 57fde9764cd..c7fdb62f693 100644
--- a/mythtv/programs/scripts/hardwareprofile/i18n.py
+++ b/mythtv/programs/scripts/hardwareprofile/i18n.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2007 Mike McGrath
@@ -40,7 +39,4 @@
     locale.setlocale(locale.LC_ALL, 'C')
     t = gettext.translation('smolt', '/usr/share/locale/', fallback=True, languages='en_US')
 
-if sys.version_info[0] == 2:
-    _ = t.ugettext
-else:
-    _ = t.gettext
+_ = t.gettext
diff --git a/mythtv/programs/scripts/hardwareprofile/os_detect.py b/mythtv/programs/scripts/hardwareprofile/os_detect.py
index 7d0edee00e4..d15d44de1e4 100644
--- a/mythtv/programs/scripts/hardwareprofile/os_detect.py
+++ b/mythtv/programs/scripts/hardwareprofile/os_detect.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2008 James Meyer <james.meyer@operamail.com>
@@ -23,10 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
-from builtins import object
 import os
-from future.utils import with_metaclass
 
 class OrderedType( type ):
     # provide global sequencing for OS class and subclasses to ensure
@@ -37,7 +32,7 @@ def __new__(mcs, name, bases, attrs):
         mcs.nextorder += 1
         return type.__new__(mcs, name, bases, attrs)
 
-class OS( with_metaclass(OrderedType, object) ):
+class OS(metaclass=OrderedType):
     _requires_func = True
     def __init__(self, ostype=-1, func=None, inst=None):
         if callable(ostype):
@@ -49,8 +44,8 @@ def __init__(self, ostype=-1, func=None, inst=None):
         self.ostype = ostype if ostype != -1 else 'posix'
 
         if (func is not None) and not callable(func):
-            raise TypeError((self.__class__.__name__ + "() requires a " \
-                            "provided function be callable."))
+            raise TypeError(self.__class__.__name__ + "() requires a " \
+                            "provided function be callable.")
 
         self.func = func
         self.inst = inst
@@ -73,16 +68,16 @@ def __call__(self, func=None):
             # being initialized into an object. we want to operate as a
             # descriptor, and receive a function as an argument
             if self.func is not None:
-                raise TypeError((self.__class__.__name__ + "() has already " \
-                                "been given a processing function"))
+                raise TypeError(self.__class__.__name__ + "() has already " \
+                                "been given a processing function")
             if (func is None) or not callable(func):
-                raise TypeError((self.__class__.__name__ + "() takes exactly " \
-                                "one callable as a function, (0 given)"))
+                raise TypeError(self.__class__.__name__ + "() takes exactly " \
+                                "one callable as a function, (0 given)")
             self.func = func
         else:
             if self._requires_func and (self.func is None):
-                raise RuntimeError((self.__class__.__name__ + "() has not " \
-                                   "been given a callable function"))
+                raise RuntimeError(self.__class__.__name__ + "() has not " \
+                                   "been given a callable function")
 
             # return boolean as to whether match was successful
 
@@ -110,7 +105,7 @@ class OSWithFile( OS ):
     _requires_func = False
     def __init__(self, filename, ostype='posix', func=None, inst=None):
         self.filename = filename
-        super(OSWithFile, self).__init__(ostype, func, inst)
+        super().__init__(ostype, func, inst)
 
     def __get__(self, inst, owner):
         if inst is None:
@@ -126,7 +121,7 @@ def do_test(self, *args, **kwargs):
         text = open(self.filename).read().strip()
         if self.func:
             # pass text into function for further processing
-            return super(OSWithFile, self).do_test(text)
+            return super().do_test(text)
         else:
             # store text as version string, and report success
             self.inst.name = text
@@ -164,7 +159,7 @@ def uname(self):
     def do_test(self, *args, **kwargs):
         if len(self.uname) == 0:
             return False
-        return super(OSFromUname, self).do_test(**self.uname)
+        return super().do_test(**self.uname)
 
 class OSInfoType( type ):
     def __new__(mcs, name, bases, attrs):
@@ -189,7 +184,7 @@ def __call__(cls):
             # fall through to Unknown
             return 'Unknown'
 
-class get_os_info( with_metaclass(OSInfoType, object) ):
+class get_os_info(metaclass=OSInfoType):
     @OS('nt')
     def windows(self):
         win_version = {
@@ -251,7 +246,7 @@ def ubuntu(self, text):
     def suselinux(self, text):
         import re
         text = text.split('\n')[0].strip()
-        return re.sub('\(\w*\)$', '', text)
+        return re.sub(r'\(\w*\)$', '', text)
 
     yellowdog   = OSWithFile('/etc/yellowdog-release')
     redhat      = OSWithFile('/etc/redhat-release')
@@ -266,7 +261,7 @@ def freebsd(self, OS, version):
     def OSX(self, OS, version):
         if OS != 'Darwin':
             return False
-        major,minor,point = [int(a) for a in version.split('.')]
+        major,minor,point = (int(a) for a in version.split('.'))
         return 'OS X 10.%s.%s' % (major-4, minor)
 
     @OS
diff --git a/mythtv/programs/scripts/hardwareprofile/request.py b/mythtv/programs/scripts/hardwareprofile/request.py
index 6e6a20b9e7e..22047b9d9fd 100644
--- a/mythtv/programs/scripts/hardwareprofile/request.py
+++ b/mythtv/programs/scripts/hardwareprofile/request.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2011 Raymond Wagner <sebastian@pipping.org>
@@ -21,9 +20,6 @@
 # providing the base url, user agent, and proxy information.
 # The object returned is slightly modified, with a shortcut to urlopen.
 
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 
 try:
     import urllib2 as urllib
@@ -42,7 +38,7 @@ def open(self):
             return urllib.urlopen(self, None, self.timeout)
         return urllib.urlopen(self)
 
-class _RequestFactory( object ):
+class _RequestFactory:
     def __init__(self, baseurl, user_agent, timeout, proxy):
         self.base_url = baseurl
         self.user_agent = user_agent
diff --git a/mythtv/programs/scripts/hardwareprofile/scan.py b/mythtv/programs/scripts/hardwareprofile/scan.py
index 1389400ece9..fa6528f35d3 100644
--- a/mythtv/programs/scripts/hardwareprofile/scan.py
+++ b/mythtv/programs/scripts/hardwareprofile/scan.py
@@ -17,9 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
 import smolt
 import json
 
diff --git a/mythtv/programs/scripts/hardwareprofile/sendProfile.py b/mythtv/programs/scripts/hardwareprofile/sendProfile.py
index ccbfdeac6d4..e2fcf2c45c5 100755
--- a/mythtv/programs/scripts/hardwareprofile/sendProfile.py
+++ b/mythtv/programs/scripts/hardwareprofile/sendProfile.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python3
-# -*- coding: utf-8 -*-
 
 # smolt - Fedora hardware profiler
 #
@@ -20,9 +19,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
-from builtins import str
-from builtins import input
 import sys
 import time
 import os
diff --git a/mythtv/programs/scripts/hardwareprofile/smolt.py b/mythtv/programs/scripts/hardwareprofile/smolt.py
index 1bcc8060d07..49c6720c11b 100644
--- a/mythtv/programs/scripts/hardwareprofile/smolt.py
+++ b/mythtv/programs/scripts/hardwareprofile/smolt.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # smolt - Fedora hardware profiler
 #
 # Copyright (C) 2007 Mike McGrath
@@ -31,7 +29,6 @@
 # Find out what we're not getting
 #
 
-from __future__ import print_function
 #import dbus
 from i18n import _
 import platform
@@ -974,7 +971,7 @@ def get_entry(a, entry):
     if not os.access("/proc/cpuinfo", os.R_OK):
         return {}
 
-    cpulist = open("/proc/cpuinfo", "r").read()
+    cpulist = open("/proc/cpuinfo").read()
     uname = os.uname()[4].lower()
 
     # This thing should return a hwdict that has the following
@@ -1161,7 +1158,7 @@ def get_entry(a, entry):
         if not os.access("/proc/openprom/banner-name", os.R_OK):
             system = 'Unknown'
         if os.access("/proc/openprom/banner-name", os.R_OK):
-            with open("/proc/openprom/banner-name", "r") as banner_name:
+            with open("/proc/openprom/banner-name") as banner_name:
                 banner_name.read()
         hwdict['platform'] = uname
         hwdict['count'] = get_entry(tmpdict, 'ncpus probed')
@@ -1234,7 +1231,7 @@ def read_memory_2_4():
     if not os.access("/proc/meminfo", os.R_OK):
         return {}
 
-    with open("/proc/meminfo", "r") as m_info:
+    with open("/proc/meminfo") as m_info:
         meminfo = m_info.read()
     lines = meminfo.split("\n")
     curline = lines[1]
@@ -1257,7 +1254,7 @@ def read_memory_2_4():
 def read_memory_2_6():
     if not os.access("/proc/meminfo", os.R_OK):
         return {}
-    with open("/proc/meminfo", "r") as m_info:
+    with open("/proc/meminfo") as m_info:
         meminfo = m_info.read()
     lines = meminfo.split("\n")
     dict = {}
@@ -1312,13 +1309,13 @@ def read_uuid():
     try:
         with open(hw_uuid_file) as hw_uuid:
             UUID = hw_uuid.read().strip()
-    except (FileNotFoundError, IOError):
+    except (FileNotFoundError, OSError):
         try:
             with open('/proc/sys/kernel/random/uuid') as rand_uuid:
                 UUID = rand_uuid.read().strip()
             with open(hw_uuid_file, 'w') as write_uuid:
                 write_uuid.write(UUID)
-        except (FileNotFoundError, IOError):
+        except (FileNotFoundError, OSError):
             sys.stderr.write(_('Unable to determine UUID of system!\n'))
             raise UUIDError('Unable to get/save UUID. file = %s.  Please run once as root.' % hw_uuid_file)
     return UUID
diff --git a/mythtv/programs/scripts/hardwareprofile/software.py b/mythtv/programs/scripts/hardwareprofile/software.py
index 53ec59084d7..be6825e0317 100644
--- a/mythtv/programs/scripts/hardwareprofile/software.py
+++ b/mythtv/programs/scripts/hardwareprofile/software.py
@@ -17,7 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
 import os
 import subprocess
 import re
@@ -41,7 +40,7 @@ def read_runlevel():
         match = initdefault_re.search(inittab)
         if match:
             defaultRunlevel = match.group(1)
-    except IOError:
+    except OSError:
         try:
             defaultRunlevel = subprocess.getstatusoutput('/sbin/runlevel')[1].split()[1].strip()
         except:
diff --git a/mythtv/programs/scripts/hardwareprofile/uuiddb.py b/mythtv/programs/scripts/hardwareprofile/uuiddb.py
index e7ba3891ecd..37355ed7384 100644
--- a/mythtv/programs/scripts/hardwareprofile/uuiddb.py
+++ b/mythtv/programs/scripts/hardwareprofile/uuiddb.py
@@ -16,9 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
 import configparser
 import logging
 import os
@@ -30,7 +27,7 @@ def _get_option_name(hw_uuid, host):
     return '%s__%s' % (hw_uuid, host)
 
 
-class _UuidDb(object):
+class _UuidDb:
     def __init__(self, database_filename):
         self._database_filename = database_filename
         self._config = configparser.RawConfigParser()
diff --git a/mythtv/programs/scripts/internetcontent/bbciplayer.py b/mythtv/programs/scripts/internetcontent/bbciplayer.py
index 5e488298ec2..a9e4f366a4e 100755
--- a/mythtv/programs/scripts/internetcontent/bbciplayer.py
+++ b/mythtv/programs/scripts/internetcontent/bbciplayer.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: bbciplayer.py
 # Python Script
@@ -175,7 +174,7 @@
 import io
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/bliptv.py b/mythtv/programs/scripts/internetcontent/bliptv.py
index 3e226e79dea..51e940a7fed 100755
--- a/mythtv/programs/scripts/internetcontent/bliptv.py
+++ b/mythtv/programs/scripts/internetcontent/bliptv.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: bliptv.py
 # Python Script
@@ -167,7 +166,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/comedycentral.py b/mythtv/programs/scripts/internetcontent/comedycentral.py
index 1f0d9cdb746..b4479a4866c 100755
--- a/mythtv/programs/scripts/internetcontent/comedycentral.py
+++ b/mythtv/programs/scripts/internetcontent/comedycentral.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: comedycentral.py
 # Python Script
@@ -62,7 +61,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/dailymotion.py b/mythtv/programs/scripts/internetcontent/dailymotion.py
index 4169701fc1b..f647cdb6ae3 100755
--- a/mythtv/programs/scripts/internetcontent/dailymotion.py
+++ b/mythtv/programs/scripts/internetcontent/dailymotion.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: dailymotion.py
 # Python Script
@@ -170,7 +169,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/hulu.py b/mythtv/programs/scripts/internetcontent/hulu.py
index 2de3e4a89e1..ba3ae124bcd 100755
--- a/mythtv/programs/scripts/internetcontent/hulu.py
+++ b/mythtv/programs/scripts/internetcontent/hulu.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: hulu.py
 # Python Script
@@ -172,7 +171,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/mnvsearch.py b/mythtv/programs/scripts/internetcontent/mnvsearch.py
index d9e73af1d9d..c990b3b46c9 100755
--- a/mythtv/programs/scripts/internetcontent/mnvsearch.py
+++ b/mythtv/programs/scripts/internetcontent/mnvsearch.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: mnvsearch.py
 # Python Script
@@ -110,7 +109,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/mtv.py b/mythtv/programs/scripts/internetcontent/mtv.py
index dfa46b19814..f61d67795d6 100755
--- a/mythtv/programs/scripts/internetcontent/mtv.py
+++ b/mythtv/programs/scripts/internetcontent/mtv.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: mtv.py
 # Python Script
@@ -169,7 +168,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/nature.py b/mythtv/programs/scripts/internetcontent/nature.py
index 21dcd34dd52..c509755df57 100755
--- a/mythtv/programs/scripts/internetcontent/nature.py
+++ b/mythtv/programs/scripts/internetcontent/nature.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: nature.py
 # Python Script
@@ -80,7 +79,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
index 798dd21d4e6..9217ddf9d4d 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: bbciplayer_api - Simple-to-use Python interface to the BBC iPlayer RSS feeds
 #                       (http://www.bbc.co.uk)
@@ -39,7 +37,7 @@
 from .bbciplayer_exceptions import (BBCUrlError, BBCHttpError, BBCRssError, BBCVideoNotFound, BBCConfigFileError, BBCUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.bbciplayer.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_exceptions.py
index 91ab14afd69..c6fc53366e2 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: bbciplayer_exceptions - Custom exceptions used or raised by bbciplayer_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
index a38835ceb96..8d35820a223 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: bliptv_api - Simple-to-use Python interface to the bliptv API (http://blip.tv/)
 # Python Script
@@ -43,14 +41,14 @@
 from MythTV import MythXML
 
 try:
-    import xml.etree.cElementTree as ElementTree
+    import xml.etree.ElementTree as ElementTree
 except ImportError:
     import xml.etree.ElementTree as ElementTree
 
 from .bliptv_exceptions import (BliptvUrlError, BliptvHttpError, BliptvRssError, BliptvVideoNotFound, BliptvXmlError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -83,7 +81,7 @@ def __init__(self, url):
     def _grabUrl(self, url):
         try:
             urlhandle = urllib.request.urlopen(url)
-        except IOError as errormsg:
+        except OSError as errormsg:
             raise BliptvHttpError(errormsg)
         return urlhandle.read()
 
@@ -96,7 +94,7 @@ def getEt(self):
         return et
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://blip.tv/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_exceptions.py
index 0bde87cba61..ce5f9eb3e58 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: bliptv_exceptions - Custom exceptions used or raised by bliptv_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
index f3682b738e4..5d3581db304 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: common_api.py - Common class libraries for all MythNetvision Mashup processing
 # Python Script
@@ -61,7 +59,7 @@
 from .common_exceptions import (WebCgiUrlError, WebCgiHttpError, WebCgiRssError, WebCgiVideoNotFound, WebCgiXmlError, )
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -125,7 +123,7 @@ def __getattr__(self, attr):
 # Start - Utility functions
 #
 ###########################################################################################################
-class Common(object):
+class Common:
     """A collection of common functions used by many grabbers
     """
     def __init__(self,
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_exceptions.py
index 35eeb067004..31ae4aec0f9 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: common_exceptions - Custom exceptions used or raised by WebCgi_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py
index f3d2353622b..c9c7938202c 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: dailymotion_api - Simple-to-use Python interface to the dailymotion API (http://www.dailymotion.com)
 # Python Script
@@ -40,14 +38,14 @@
 from MythTV import MythXML
 
 try:
-    import xml.etree.cElementTree as ElementTree
+    import xml.etree.ElementTree as ElementTree
 except ImportError:
     import xml.etree.ElementTree as ElementTree
 
 from .dailymotion_exceptions import (DailymotionUrlError, DailymotionHttpError, DailymotionRssError, DailymotionVideoNotFound, DailymotionInvalidSearchType, DailymotionXmlError, DailymotionVideoDetailError, DailymotionCategoryNotFound)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -80,7 +78,7 @@ def __init__(self, url):
     def _grabUrl(self, url):
         try:
             urlhandle = urllib.request.urlopen(url)
-        except IOError as errormsg:
+        except OSError as errormsg:
             raise DailymotionHttpError(errormsg)
         return urlhandle.read()
 
@@ -93,7 +91,7 @@ def getEt(self):
         return et
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.dailymotion.com
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_exceptions.py
index ebe72444b23..bf0702b35c8 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: dailymotion_exceptions - Custom exceptions used or raised by dailymotion_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_api.py
index ed668bb41f5..b5e5c258e25 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: hulu_api - Simple-to-use Python interface to the Hulu RSS feeds
 #                       (http://www.hulu.com/)
@@ -36,7 +34,7 @@
 from .hulu_exceptions import (HuluUrlError, HuluHttpError, HuluRssError, HuluVideoNotFound, HuluConfigFileError, HuluUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -83,7 +81,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.hulu.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their
     site target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_exceptions.py
index 9e9f8fa7ec9..eef2b17f1ac 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: hulu_exceptions - Custom exceptions used or raised by hulu_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mainProcess.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mainProcess.py
index 88b2eaac44a..156d4784c05 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mainProcess.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mainProcess.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mainProcess.py
 # Python Script
@@ -38,7 +36,7 @@
 from optparse import OptionParser
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_api.py
index 6c1bf2e2a94..59f03af1361 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mashups_api - Simple-to-use Python interface to Mashups of RSS feeds and HTML video data
 #
@@ -36,7 +34,7 @@
 from .mashups_exceptions import (MashupsUrlError, MashupsHttpError, MashupsRssError, MashupsVideoNotFound, MashupsConfigFileError, MashupsUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -83,7 +81,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to any Mashup
     This is done to support a common naming framework for all python Netvision plugins
     no matter their site target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_exceptions.py
index 8e69edc780c..dadf9178bed 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mashups_exceptions - Custom exceptions used or raised by mashups_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_api.py
index b01c03e9be5..c5eec092323 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mnvsearch_api - Simple-to-use Python interface to search the MythNetvision data base tables
 #
@@ -37,7 +35,7 @@
 from .mnvsearch_exceptions import (MNVSQLError, MNVVideoNotFound, )
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -110,7 +108,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to the MNV treeview table search
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_exceptions.py
index a88ca8d4341..7637c834ebd 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mnvsearch_exceptions - Custom exceptions used or raised by mnvsearch_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
index 45768a07409..eba1085f78c 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mtv_api - Simple-to-use Python interface to the MTV API (http://www.mtv.com/)
 # Python Script
@@ -41,14 +39,14 @@
 import logging
 
 try:
-    import xml.etree.cElementTree as ElementTree
+    import xml.etree.ElementTree as ElementTree
 except ImportError:
     import xml.etree.ElementTree as ElementTree
 
 from .mtv_exceptions import (MtvUrlError, MtvHttpError, MtvRssError, MtvVideoNotFound, MtvInvalidSearchType, MtvXmlError, MtvVideoDetailError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -81,7 +79,7 @@ def __init__(self, url):
     def _grabUrl(self, url):
         try:
             urlhandle = urllib.request.urlopen(url)
-        except IOError as errormsg:
+        except OSError as errormsg:
             raise MtvHttpError(errormsg)
         return urlhandle.read()
 
@@ -94,7 +92,7 @@ def getEt(self):
         return et
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.mtv.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
@@ -429,7 +427,7 @@ def searchTitle(self, title, pagenumber, pagelen):
                         item[key] = self.massageDescription(item[key].strip())
                         item[key] = item[key].replace('|', '-')
                     continue
-                if type(item[key]) == type(''):
+                if type(item[key]) == str:
                     if item[key]:
                         item[key] = item[key].replace('"\n',' ').strip()
             elements_final.append(item)
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_exceptions.py
index 58548d4188e..1df86aef155 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mtv_exceptions - Custom exceptions used or raised by mtv_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_api.py
index 1383a1b3f21..edbbbf5265b 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: pbs_api - Simple-to-use Python interface to the PBS RSS feeds
 #                       (http://video.pbs.org/)
@@ -34,7 +32,7 @@
 from .pbs_exceptions import (PBSUrlError, PBSHttpError, PBSRssError, PBSVideoNotFound, PBSConfigFileError, PBSUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -99,7 +97,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://video.pbs.org/
     This is done to support a common naming framework for all python Netvision plugins no matter their
     site target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_exceptions.py
index 12a9dfd6d8f..69f9597909d 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: pbs_exceptions - Custom exceptions used or raised by pbs_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_api.py
index 0ecd69eb30e..d4a2f22bf24 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: rev3_api - Simple-to-use Python interface to the Revision3 RSS feeds (http://revision3.com/)
 # Python Script
@@ -39,7 +37,7 @@
 from .rev3_exceptions import (Rev3UrlError, Rev3HttpError, Rev3RssError, Rev3VideoNotFound, Rev3ConfigFileError, Rev3UrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.rev3.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_exceptions.py
index c40647501f6..03c32024d53 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: rev3_exceptions - Custom exceptions used or raised by rev3_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_api.py
index 56b6dbfb8ca..1695532a0e5 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: tedtalks_api - Simple-to-use Python interface to the TedTalks RSS feeds
 #                       (http://www.ted.com)
@@ -33,7 +31,7 @@
 from .tedtalks_exceptions import (TedTalksUrlError, TedTalksHttpError, TedTalksRssError, TedTalksVideoNotFound, TedTalksConfigFileError, TedTalksUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -98,7 +96,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.ted.com
     This is done to support a common naming framework for all python Netvision plugins no matter their
     site target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_exceptions.py
index 72db924e0f9..f7c38287f7b 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: tedtalks_exceptions - Custom exceptions used or raised by tedtalks_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_api.py
index 142c928f270..227b35a124a 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: thewb_api - Simple-to-use Python interface to the The WB RSS feeds (http://www.thewb.com/)
 # Python Script
@@ -34,7 +32,7 @@
 from .thewb_exceptions import (TheWBUrlError, TheWBHttpError, TheWBRssError, TheWBVideoNotFound, TheWBConfigFileError, TheWBUrlDownloadError)
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -98,7 +96,7 @@ def can_int(x):
 # end _can_int
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.thewb.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_exceptions.py
index d824140701c..cc744872888 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: thewb_exceptions - Custom exceptions used or raised by thewb_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/oauth/oauth_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/oauth/oauth_api.py
index 314e171ea39..7bb3de942c0 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/oauth/oauth_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/oauth/oauth_api.py
@@ -68,7 +68,7 @@ def generate_verifier(length=8):
     return ''.join([str(random.randint(0, 9)) for i in range(length)])
 
 
-class OAuthConsumer(object):
+class OAuthConsumer:
     """Consumer of OAuth authentication.
 
     OAuthConsumer is a data type that represents the identity of the Consumer
@@ -83,7 +83,7 @@ def __init__(self, key, secret):
         self.secret = secret
 
 
-class OAuthToken(object):
+class OAuthToken:
     """OAuthToken is a data type that represents an End User via either an access
     or request token.
 
@@ -152,7 +152,7 @@ def __str__(self):
         return self.to_string()
 
 
-class OAuthRequest(object):
+class OAuthRequest:
     """OAuthRequest represents the request and can be serialized.
 
     OAuth parameters:
@@ -365,7 +365,7 @@ def _split_url_string(param_str):
         return parameters
     _split_url_string = staticmethod(_split_url_string)
 
-class OAuthServer(object):
+class OAuthServer:
     """A worker to check the validity of a request against a data store."""
     timestamp_threshold = 300 # In seconds, five minutes.
     version = VERSION
@@ -526,7 +526,7 @@ def _check_nonce(self, consumer, token, nonce):
             raise OAuthError('Nonce already used: %s' % str(nonce))
 
 
-class OAuthClient(object):
+class OAuthClient:
     """OAuthClient is a worker to attempt to execute a request."""
     consumer = None
     token = None
@@ -554,7 +554,7 @@ def access_resource(self, oauth_request):
         raise NotImplementedError
 
 
-class OAuthDataStore(object):
+class OAuthDataStore:
     """A database abstraction used to lookup consumers and tokens."""
 
     def lookup_consumer(self, key):
@@ -582,7 +582,7 @@ def authorize_request_token(self, oauth_token, user):
         raise NotImplementedError
 
 
-class OAuthSignatureMethod(object):
+class OAuthSignatureMethod:
     """A strategy class that implements a signature method."""
     def get_name(self):
         """-> str."""
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
index 2523175f8d1..bdc887f49e0 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright (C) 2009 Marc Poulhiès
 #
 # Python module for Vimeo
@@ -593,7 +591,7 @@ def video_request(video, format):
 # MythTV Netvideo specific classes start here
 #################################################################################################
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -617,7 +615,7 @@ def __getattr__(self, attr):
     sys.stderr = OutStreamEncoder(sys.stderr, 'utf8')
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://vimeo.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_data.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_data.py
index 845fab417c6..5705cb34157 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_data.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_data.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 from string import ascii_uppercase, ascii_lowercase
 
-class getData(object):
+class getData:
     def __init__(self):
         self.a = b'3530346e36313539393971733336717171323031323134377036356f6f367030'
         self.s = b'3330373736326f7236716e30323171'
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py
index 3dd0688390d..9b3abcd5fde 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: vimeo_exceptions - Custom exceptions used or raised by vimeo_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py
index 7acf01186d6..a15f1c48f35 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: bliptvXSL_api - XPath and XSLT functions for the Blip.tv RSS/HTML itmes
 # Python Script
@@ -38,7 +36,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -88,7 +86,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/chrisPirillo_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/chrisPirillo_api.py
index 738623d58a9..614b72b7188 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/chrisPirillo_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/chrisPirillo_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: chrisPirillo_api - XPath and XSLT functions for the chris.pirillo.com RSS/HTML items
 # Python Script
@@ -35,7 +33,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -84,7 +82,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/cinemarv_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/cinemarv_api.py
index 099f5961519..2a310df3f04 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/cinemarv_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/cinemarv_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: cinemarv_api - XPath and XSLT functions for the CinemaRV.com grabber
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/comedycentral_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/comedycentral_api.py
index 15f79f39390..8bbde68e71e 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/comedycentral_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/comedycentral_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: comedycentral_api - XPath and XSLT functions for the Comedy Central RSS/HTML items
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/hubbleCast_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/hubbleCast_api.py
index 72b5c7d255c..64944afea92 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/hubbleCast_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/hubbleCast_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: hubbleCast_api - XPath and XSLT functions for the HubbleCast RSS/HTML items
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/linuxAction_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/linuxAction_api.py
index be707dceaf2..ee5e3b36c44 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/linuxAction_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/linuxAction_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: linuxAction_api - XPath and XSLT functions for the www.jupiterbroadcasting.com RSS/HTML items
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/mevio_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/mevio_api.py
index 11c11b06b63..7f22b0477a9 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/mevio_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/mevio_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: mevio_api - XPath and XSLT functions for the Mevio RSS/HTML items
 # Python Script
@@ -38,7 +36,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -87,7 +85,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/nasa_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/nasa_api.py
index 639dbc32a3d..5a9aed0f67b 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/nasa_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/nasa_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: nasa_api - XPath and XSLT functions for the NASA RSS/HTML items
 # Python Script
@@ -37,7 +35,7 @@
 import io
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/pbsXSL_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/pbsXSL_api.py
index b5bed4e84ae..498d91c40bf 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/pbsXSL_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/pbsXSL_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: pbsXSL_api - XPath and XSLT functions for the PBS RSS/HTML itmes
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/revision3XSL_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/revision3XSL_api.py
index 059d102c1ac..153f407f39c 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/revision3XSL_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/revision3XSL_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: revision3XSL_api - XPath and XSLT functions for the Revision3 RSS/HTML items
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/skyAtNight_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/skyAtNight_api.py
index a08d5665bc8..319606668cb 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/skyAtNight_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/skyAtNight_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: skyAtNight_api - XPath and XSLT functions for the BBC Sky at Night magazine RSS/HTML items
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/spitzer_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/spitzer_api.py
index bebe91d1e4d..3bd23b05630 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/spitzer_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/spitzer_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: spitzer_api - XPath and XSLT functions for the www.spitzer.caltech.edu grabber
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tedtalksXSL_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tedtalksXSL_api.py
index e3127ce3f99..5225f01278e 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tedtalksXSL_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tedtalksXSL_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: tedtalksXSL_api - XPath and XSLT functions for the TedTalks RSS/HTML itmes
 # Python Script
@@ -38,7 +36,7 @@
 import io
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/traileraddicts_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/traileraddicts_api.py
index b8212c5136c..a7ed124a763 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/traileraddicts_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/traileraddicts_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: traileraddicts_api - XPath and XSLT functions for the TrailerAddicts.com grabber
 # Python Script
@@ -36,7 +34,7 @@
 from copy import deepcopy
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -85,7 +83,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
index 9caf271feba..c24e2a3e4d0 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: tributeca_api - XPath and XSLT functions for the Tribute.ca grabber
 # Python Script
@@ -37,7 +35,7 @@
 from copy import deepcopy
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py
index 8097191e5ba..480cc6f2abe 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: youtubeXSL_api - XPath and XSLT functions for the mashup grabbers
 # Python Script
@@ -37,7 +35,7 @@
 import io
 
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
@@ -86,7 +84,7 @@ def __getattr__(self, attr):
     sys.exit(1)
 
 
-class xpathFunctions(object):
+class xpathFunctions:
     """Functions specific extending XPath
     """
     def __init__(self):
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
index 1265fabbb92..e10d5b65fc5 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: youtube_api - Simple-to-use Python interface to the youtube API (http://www.youtube.com/)
 # Python Script
@@ -64,11 +62,11 @@ def getJson(self):
         try:
             urlhandle = urllib.request.urlopen(self.url)
             return json.load(urlhandle)
-        except IOError as errormsg:
+        except OSError as errormsg:
             raise YouTubeHttpError(errormsg)
 
 
-class Videos(object):
+class Videos:
     """Main interface to http://www.youtube.com/
     This is done to support a common naming framework for all python Netvision plugins no matter their site
     target.
@@ -457,7 +455,7 @@ def parseDetails(self, entry):
                     if item[key]:
                         item[key] = self.massageDescription(item[key].strip())
                         item[key] = item[key].replace('|', '-')
-                elif type(item[key]) == type(''):
+                elif type(item[key]) == str:
                     if item[key]:
                         item[key] = self.common.ampReplace(item[key].replace('"\n',' ').strip())
         except KeyError:
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_data.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_data.py
index 4858768e404..94cc9665013 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_data.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_data.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 from string import ascii_uppercase, ascii_lowercase
 
-class getData(object):
+class getData:
     def __init__(self):
         self.a = '4e566d6e466c50784b416e477a527176587337444b5730554530324e4d39706d6774535531614c'
 
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_exceptions.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_exceptions.py
index 8e47ed44774..040dd52e37d 100644
--- a/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_exceptions.py
+++ b/mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_exceptions.py
@@ -1,5 +1,3 @@
-# -*- coding: UTF-8 -*-
-
 # ----------------------
 # Name: youtube_exceptions - Custom exceptions used or raised by youtube_api
 # Python Script
diff --git a/mythtv/programs/scripts/internetcontent/pbs.py b/mythtv/programs/scripts/internetcontent/pbs.py
index ad990306e6d..13ad4915551 100755
--- a/mythtv/programs/scripts/internetcontent/pbs.py
+++ b/mythtv/programs/scripts/internetcontent/pbs.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: pbs.py
 # Python Script
@@ -76,7 +75,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/rev3.py b/mythtv/programs/scripts/internetcontent/rev3.py
index 121bf495d58..7e957d5df4d 100755
--- a/mythtv/programs/scripts/internetcontent/rev3.py
+++ b/mythtv/programs/scripts/internetcontent/rev3.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: rev3.py
 # Python Script
@@ -174,7 +173,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/space.py b/mythtv/programs/scripts/internetcontent/space.py
index dd950a748af..84a784e5275 100755
--- a/mythtv/programs/scripts/internetcontent/space.py
+++ b/mythtv/programs/scripts/internetcontent/space.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: space.py
 # Python Script
@@ -64,7 +63,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/technology.py b/mythtv/programs/scripts/internetcontent/technology.py
index c7cd4471290..002259493e7 100755
--- a/mythtv/programs/scripts/internetcontent/technology.py
+++ b/mythtv/programs/scripts/internetcontent/technology.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: technology.py
 # Python Script
@@ -77,7 +76,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/tedtalks.py b/mythtv/programs/scripts/internetcontent/tedtalks.py
index e73635ef547..975ad5b0c4f 100755
--- a/mythtv/programs/scripts/internetcontent/tedtalks.py
+++ b/mythtv/programs/scripts/internetcontent/tedtalks.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: tedtalks.py
 # Python Script
@@ -76,7 +75,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/thewb.py b/mythtv/programs/scripts/internetcontent/thewb.py
index c29717ec1c2..0ad17111f60 100755
--- a/mythtv/programs/scripts/internetcontent/thewb.py
+++ b/mythtv/programs/scripts/internetcontent/thewb.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: thewb.py
 # Python Script
@@ -80,7 +79,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/trailers.py b/mythtv/programs/scripts/internetcontent/trailers.py
index 5e9ea8dc1e3..2f16943f72d 100755
--- a/mythtv/programs/scripts/internetcontent/trailers.py
+++ b/mythtv/programs/scripts/internetcontent/trailers.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: trailers.py
 # Python Script
@@ -75,7 +74,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder"""
     def __init__(self, outstream, encoding=None):
         self.out = outstream
diff --git a/mythtv/programs/scripts/internetcontent/vimeo.py b/mythtv/programs/scripts/internetcontent/vimeo.py
index 3b93d7a7218..6dd3ef384ca 100755
--- a/mythtv/programs/scripts/internetcontent/vimeo.py
+++ b/mythtv/programs/scripts/internetcontent/vimeo.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: vimeo.py
 # Python Script
@@ -169,7 +168,7 @@
 import sys, os
 import io
 
-class OutStreamEncoder(object):
+class OutStreamEncoder:
     """Wraps a stream with an encoder
     """
     def __init__(self, outstream, encoding=None):
diff --git a/mythtv/programs/scripts/internetcontent/youtube.py b/mythtv/programs/scripts/internetcontent/youtube.py
index 1088e57cd9f..f54f66047e8 100755
--- a/mythtv/programs/scripts/internetcontent/youtube.py
+++ b/mythtv/programs/scripts/internetcontent/youtube.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: youtube.py
 # Python Script
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
index 702d19575d1..1972030928c 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: tmdb3.py
 # Python Script
diff --git a/mythtv/programs/scripts/metadata/Music/discid/disc.py b/mythtv/programs/scripts/metadata/Music/discid/disc.py
index 023b8ca2988..2627d72340b 100644
--- a/mythtv/programs/scripts/metadata/Music/discid/disc.py
+++ b/mythtv/programs/scripts/metadata/Music/discid/disc.py
@@ -89,7 +89,7 @@ class TOCError(Exception):
     pass
 
 
-class Disc(object):
+class Disc:
     """The class of the object returned by :func:`read` or :func:`put`.
     """
 
diff --git a/mythtv/programs/scripts/metadata/Music/discid/track.py b/mythtv/programs/scripts/metadata/Music/discid/track.py
index d0635b83300..c79a2c4a7fc 100644
--- a/mythtv/programs/scripts/metadata/Music/discid/track.py
+++ b/mythtv/programs/scripts/metadata/Music/discid/track.py
@@ -24,7 +24,7 @@
 from discid.util import _decode, _sectors_to_seconds
 
 
-class Track(object):
+class Track:
     """Track objects are part of the :class:`Disc` class.
     """
 
diff --git a/mythtv/programs/scripts/metadata/Music/discid/util.py b/mythtv/programs/scripts/metadata/Music/discid/util.py
index e8c884dec64..1a6d4cbd9e0 100644
--- a/mythtv/programs/scripts/metadata/Music/discid/util.py
+++ b/mythtv/programs/scripts/metadata/Music/discid/util.py
@@ -37,7 +37,7 @@ def _decode(byte_string):
     """Decode byte string to (unicode) string
     """
     # this test for bytes works on Python 2 and 3
-    if type(byte_string) == type(b"test"):
+    if type(byte_string) == bytes:
         return byte_string.decode()
     else:
         # probably mocked for sphinx
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py b/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py
index 11045033747..d4051fd7e22 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/alsong.py
@@ -1,4 +1,3 @@
-#-*- coding: UTF-8 -*-
 """
 Scraper for http://lyrics.alsong.co.kr/
 driip
@@ -88,7 +87,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -105,7 +104,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'alsong.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/baidu.py b/mythtv/programs/scripts/metadata/Music/lyrics/baidu.py
index 1efe23ae3d6..a9126a586ae 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/baidu.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/baidu.py
@@ -1,4 +1,3 @@
-#-*- coding: UTF-8 -*-
 """
 Scraper for http://www.baidu.com
 
@@ -76,7 +75,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -93,7 +92,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'baidu.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/common/audiofile.py b/mythtv/programs/scripts/metadata/Music/lyrics/common/audiofile.py
index 43d12c06ecc..455711a423c 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/common/audiofile.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/common/audiofile.py
@@ -1,4 +1,3 @@
-# -*- Mode: python; coding: utf-8; tab-width: 8; indent-tabs-mode: t; -*-
 """
 read audio stream from audio file
 """
@@ -9,7 +8,7 @@
 class UnknownFormat(Exception):pass
 class FormatError(Exception):pass
 
-class AudioFile(object):
+class AudioFile:
     f = None
     audioStart = 0
 
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py b/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py
index e2c6bc94550..93d12252c9f 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/darklyrics.py
@@ -1,4 +1,3 @@
-#-*- coding: UTF-8 -*-
 """
 Scraper for http://www.darklyrics.com/ - the largest metal lyrics archive on the Web.
 
@@ -157,7 +156,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -166,7 +165,7 @@ def buildLyrics(lyrics):
 
     lines = lyrics.lyrics.splitlines()
     for line in lines:
-        line2 = re.sub(u'[^\u0020-\uD7FF\u0009\u000A\u000D\uE000-\uFFFD\u10000-\u10FFFF]+', '', line)
+        line2 = re.sub('[^\u0020-\uD7FF\u0009\u000A\u000D\uE000-\uFFFD\u10000-\u10FFFF]+', '', line)
         etree.SubElement(xml, "lyric").text = line2
 
     utilities.log(True, utilities.convert_etree(etree.tostring(xml, encoding='UTF-8',
@@ -175,7 +174,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'darklyrics.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/embedlrc.py b/mythtv/programs/scripts/metadata/Music/lyrics/embedlrc.py
index d80e028aa57..bc1e191dcd0 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/embedlrc.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/embedlrc.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 """
 Scraper for embedded lyrics
@@ -182,7 +181,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -199,7 +198,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'alsong.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/filelyrics.py b/mythtv/programs/scripts/metadata/Music/lyrics/filelyrics.py
index 5d24df3d773..1cc09147104 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/filelyrics.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/filelyrics.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
 # ----------------------
 """
 Scraper for file lyrics
@@ -34,7 +33,7 @@ def get_lyrics(self, lyrics):
         utilities.log(debug, "%s: searching for lyrics file: %s " % (__title__, lyricFile))
         if os.path.exists(lyricFile) and os.path.isfile(lyricFile):
             #load the text file
-            with open (lyricFile, "r") as f:
+            with open (lyricFile) as f:
                 lines = f.readlines()
 
             for line in lines:
@@ -72,7 +71,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -88,7 +87,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'alsong.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/genius.py b/mythtv/programs/scripts/metadata/Music/lyrics/genius.py
index fb73728c0ba..d6cc1f47d2d 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/genius.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/genius.py
@@ -1,4 +1,3 @@
-#-*- coding: UTF-8 -*-
 """
 Scraper for http://www.genius.com
 
@@ -79,7 +78,7 @@ def get_lyrics(self, lyrics):
         except:
             # may be necessary for python 3.10
             response = html.unescape(response.decode('utf-8'))
-        matchcode = re.search(u'<div class="[lL]yrics.*?">(.*?)</div>', response, flags=re.DOTALL)
+        matchcode = re.search('<div class="[lL]yrics.*?">(.*?)</div>', response, flags=re.DOTALL)
         try:
             lyricscode = (matchcode.group(1))
             lyr = re.sub('<[^<]+?>', '', lyricscode)
@@ -111,7 +110,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -128,7 +127,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'minilyrics.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/gomaudio.py b/mythtv/programs/scripts/metadata/Music/lyrics/gomaudio.py
index b1277a3cbe6..6574081c633 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/gomaudio.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/gomaudio.py
@@ -1,4 +1,3 @@
-# -*- Mode: python; coding: utf-8; tab-width: 8; indent-tabs-mode: t; -*-
 """
 Scraper for http://newlyrics.gomtv.com/
 
@@ -31,10 +30,10 @@
 
 def remove_accents(data):
     nfkd_data = unicodedata.normalize('NFKD', data)
-    return u"".join([c for c in nfkd_data if not unicodedata.combining(c)])
+    return "".join([c for c in nfkd_data if not unicodedata.combining(c)])
 
 
-class gomClient(object):
+class gomClient:
     '''
     privide Gom specific function, such as key from mp3
     '''
@@ -120,7 +119,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -137,7 +136,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'gomaudio.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py b/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py
index 793c7919151..bba626eca95 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricscom.py
@@ -1,4 +1,3 @@
-# -*- Mode: python; coding: utf-8; tab-width: 8; indent-tabs-mode: t; -*-
 """
 Scraper for http://www.lyrdb.com/
 
@@ -77,10 +76,10 @@ def get_lyrics(self, lyrics):
                     return False
                 req2.close()
 
-                matchcode = re.search(u'<pre.*?>(.*?)</pre>', resp2, flags=re.DOTALL)
+                matchcode = re.search('<pre.*?>(.*?)</pre>', resp2, flags=re.DOTALL)
                 if matchcode:
                     lyricscode = (matchcode.group(1))
-                    lyr = re.sub(u'<[^<]+?>', '', lyricscode)
+                    lyr = re.sub('<[^<]+?>', '', lyricscode)
                     lyrics.lyrics = lyr.replace('\\n','\n')
                     return True
 
@@ -114,7 +113,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -131,7 +130,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'lyricscom.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/lyricsmode.py b/mythtv/programs/scripts/metadata/Music/lyrics/lyricsmode.py
index b8c6f1a7358..94e0e656f76 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricsmode.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricsmode.py
@@ -1,4 +1,3 @@
-#-*- coding: UTF-8 -*-
 import sys
 
 try:
@@ -80,7 +79,7 @@ def get_lyrics(self, lyrics):
                 line.strip()
                 if line.find("Lyrics from:") < 0:
                     lir.append(line)
-            lyr = u"\n".join( lir )
+            lyr = "\n".join( lir )
             if lyr.startswith('These lyrics are missing'):
                 return False
             lyrics.lyrics = lyr
@@ -116,7 +115,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -133,7 +132,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'lyricsmode.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py b/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py
index c6fe1f2079b..8c0c6d3ee7a 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/lyricswiki.py
@@ -1,5 +1,3 @@
-#-*- coding: UTF-8 -*-
-
 import sys, re, socket
 
 try:
@@ -15,10 +13,7 @@
 
 from optparse import OptionParser
 
-if sys.version_info < (2, 7):
-    import simplejson
-else:
-    import json as simplejson
+import json as simplejson
 
 from common import *
 
@@ -102,7 +97,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -119,7 +114,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'lyricswiki.py'
diff --git a/mythtv/programs/scripts/metadata/Music/lyrics/ttplayer.py b/mythtv/programs/scripts/metadata/Music/lyrics/ttplayer.py
index eca9e6fb993..2b0decbfc97 100644
--- a/mythtv/programs/scripts/metadata/Music/lyrics/ttplayer.py
+++ b/mythtv/programs/scripts/metadata/Music/lyrics/ttplayer.py
@@ -1,4 +1,3 @@
-# -*- Mode: python; coding: utf-8; tab-width: 8; indent-tabs-mode: t; -*-
 """
 Scraper for http://lrcct2.ttplayer.com/
 
@@ -35,7 +34,7 @@
 LYRIC_TITLE_REPLACE=[("/", "-"),(" & ", " and ")]
 LYRIC_ARTIST_REPLACE=[("/", "-"),(" & ", " and ")]
 
-class ttpClient(object):
+class ttpClient:
     '''
     privide ttplayer specific function, such as encoding artist and title,
     generate a Id code for server authorizition.
@@ -217,7 +216,7 @@ def performSelfTest():
 
 def buildLyrics(lyrics):
     from lxml import etree
-    xml = etree.XML(u'<lyrics></lyrics>')
+    xml = etree.XML('<lyrics></lyrics>')
     etree.SubElement(xml, "artist").text = lyrics.artist
     etree.SubElement(xml, "album").text = lyrics.album
     etree.SubElement(xml, "title").text = lyrics.title
@@ -234,7 +233,7 @@ def buildLyrics(lyrics):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'ttplayer.py'
diff --git a/mythtv/programs/scripts/metadata/Music/mbutils.py b/mythtv/programs/scripts/metadata/Music/mbutils.py
index e7f88abd06d..fa6ae129bc2 100755
--- a/mythtv/programs/scripts/metadata/Music/mbutils.py
+++ b/mythtv/programs/scripts/metadata/Music/mbutils.py
@@ -47,7 +47,7 @@ def convert_etree(etostr):
 def search_releases(artist, album, limit):
     from lxml import etree
 
-    root = etree.XML(u'<searchreleases></searchreleases>')
+    root = etree.XML('<searchreleases></searchreleases>')
 
     result = musicbrainzngs.search_releases(artist=artist, release=album, country="GB", limit=limit)
 
@@ -80,7 +80,7 @@ def search_releases(artist, album, limit):
 def search_artists(artist, limit):
     from lxml import etree
 
-    root = etree.XML(u'<artists></artists>')
+    root = etree.XML('<artists></artists>')
     result = musicbrainzngs.search_artists(artist=artist, limit=limit)
 
     if debug:
@@ -104,7 +104,7 @@ def search_artists(artist, limit):
 def get_artist(artistid):
     from lxml import etree
 
-    root = etree.XML(u'<artist></artist>')
+    root = etree.XML('<artist></artist>')
 
     # lookup the artist id
     result = musicbrainzngs.get_artist_by_id(artistid, includes=['url-rels'])
@@ -135,7 +135,7 @@ def get_artist(artistid):
 def find_coverart(release):
     from lxml import etree
 
-    root = etree.XML(u'<coverart></coverart>')
+    root = etree.XML('<coverart></coverart>')
 
     try:
         data = musicbrainzngs.get_image_list(release)
@@ -168,7 +168,7 @@ def find_coverart(release):
 def find_coverart_releasegroup(releaseGroup):
     from lxml import etree
 
-    root = etree.XML(u'<coverart></coverart>')
+    root = etree.XML('<coverart></coverart>')
 
     try:
         data = musicbrainzngs.get_release_group_image_list(releaseGroup)
@@ -202,7 +202,7 @@ def find_disc(cddrive):
     import discid
     from lxml import etree
 
-    root = etree.XML(u'<finddisc></finddisc>')
+    root = etree.XML('<finddisc></finddisc>')
 
     try:
         disc = discid.read(cddrive, ["mcn", "isrc"])
@@ -275,7 +275,7 @@ def find_disc(cddrive):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<version></version>')
+    version = etree.XML('<version></version>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "command").text = 'mbutils.py'
diff --git a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/caa.py b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/caa.py
index 12fa8d3536e..df99f0ee6fd 100644
--- a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/caa.py
+++ b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/caa.py
@@ -10,8 +10,9 @@
     ]
 
 import json
+import urllib.request
+import urllib.parse
 
-from musicbrainzngs import compat
 from musicbrainzngs import musicbrainz
 
 hostname = "coverartarchive.org"
@@ -44,7 +45,7 @@ def _caa_request(mbid, imageid=None, size=None, entitytype="release"):
         path.append("%s-%s" % (imageid, size))
     elif imageid:
         path.append(imageid)
-    url = compat.urlunparse((
+    url = urllib.parse.urlunparse((
         'http',
         hostname,
         '/%s' % '/'.join(path),
@@ -55,10 +56,10 @@ def _caa_request(mbid, imageid=None, size=None, entitytype="release"):
     musicbrainz._log.debug("GET request for %s" % (url, ))
 
     # Set up HTTP request handler and URL opener.
-    httpHandler = compat.HTTPHandler(debuglevel=0)
+    httpHandler = urllib.request.HTTPHandler(debuglevel=0)
     handlers = [httpHandler]
 
-    opener = compat.build_opener(*handlers)
+    opener = urllib.request.build_opener(*handlers)
 
     # Make request.
     req = musicbrainz._MusicbrainzHttpRequest("GET", url, None)
diff --git a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py
deleted file mode 100644
index 36574b5c047..00000000000
--- a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/compat.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2012 Kenneth Reitz.
-
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""
-pythoncompat
-"""
-
-
-import sys
-
-# -------
-# Pythons
-# -------
-
-# Syntax sugar.
-_ver = sys.version_info
-
-#: Python 2.x?
-is_py2 = (_ver[0] == 2)
-
-#: Python 3.x?
-is_py3 = (_ver[0] == 3)
-
-# ---------
-# Specifics
-# ---------
-
-if is_py2:
-	from StringIO import StringIO
-	from urllib2 import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-						HTTPHandler, build_opener, HTTPError, URLError,\
-						build_opener
-	from httplib import BadStatusLine, HTTPException
-	from urlparse import urlunparse
-	from urllib import urlencode
-
-	bytes = str
-	unicode = unicode
-	basestring = basestring
-elif is_py3:
-	from io import StringIO
-	from urllib.request import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-								HTTPHandler, build_opener
-	from urllib.error import HTTPError, URLError
-	from http.client import HTTPException, BadStatusLine
-	from urllib.parse import urlunparse, urlencode
-
-	unicode = str
-	bytes = bytes
-	basestring = (str,bytes)
diff --git a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/musicbrainz.py b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/musicbrainz.py
index 1892d90f0ae..2470da08f41 100644
--- a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/musicbrainz.py
+++ b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/musicbrainz.py
@@ -12,13 +12,16 @@
 import locale
 import sys
 import json
+import http.client
+import urllib.error
+import urllib.request
+import urllib.parse
 import xml.etree.ElementTree as etree
 from xml.parsers import expat
 from warnings import warn
 
 from musicbrainzngs import mbxml
 from musicbrainzngs import util
-from musicbrainzngs import compat
 
 _version = "0.6dev"
 _log = logging.getLogger("musicbrainzngs")
@@ -172,7 +175,7 @@ class InvalidSearchFieldError(UsageError):
 
 class InvalidIncludeError(UsageError):
     def __init__(self, msg='Invalid Includes', reason=None):
-        super(InvalidIncludeError, self).__init__(self)
+        super().__init__(self)
         self.msg = msg
         self.reason = reason
 
@@ -181,7 +184,7 @@ def __str__(self):
 
 class InvalidFilterError(UsageError):
     def __init__(self, msg='Invalid Includes', reason=None):
-        super(InvalidFilterError, self).__init__(self)
+        super().__init__(self)
         self.msg = msg
         self.reason = reason
 
@@ -238,9 +241,9 @@ def _check_filter_and_make_params(entity, includes, release_status=[], release_t
     the filters can be used with the given includes. Return a params
     dict that can be passed to _do_mb_query.
     """
-    if isinstance(release_status, compat.basestring):
+    if isinstance(release_status, (str, bytes)):
         release_status = [release_status]
-    if isinstance(release_type, compat.basestring):
+    if isinstance(release_type, (str, bytes)):
         release_type = [release_type]
     _check_filter(release_status, VALID_RELEASE_STATUSES)
     _check_filter(release_type, VALID_RELEASE_TYPES)
@@ -345,7 +348,7 @@ def set_rate_limit(limit_or_interval=1.0, new_requests=1):
         limit_interval = limit_or_interval
         limit_requests = new_requests
 
-class _rate_limit(object):
+class _rate_limit:
     """A decorator that limits the rate at which the function may be
     called. The rate is controlled by the `limit_interval` and
     `limit_requests` global variables.  The limiting is thread-safe;
@@ -393,7 +396,7 @@ def __call__(self, *args, **kwargs):
             return self.fun(*args, **kwargs)
 
 # From pymb2
-class _RedirectPasswordMgr(compat.HTTPPasswordMgr):
+class _RedirectPasswordMgr(urllib.request.HTTPPasswordMgr):
     def __init__(self):
         self._realms = { }
 
@@ -408,13 +411,13 @@ def add_password(self, realm, uri, username, password):
         # ignoring the uri parameter intentionally
         self._realms[realm] = (username, password)
 
-class _DigestAuthHandler(compat.HTTPDigestAuthHandler):
+class _DigestAuthHandler(urllib.request.HTTPDigestAuthHandler):
     def get_authorization (self, req, chal):
         qop = chal.get ('qop', None)
         if qop and ',' in qop and 'auth' in qop.split (','):
             chal['qop'] = 'auth'
 
-        return compat.HTTPDigestAuthHandler.get_authorization (self, req, chal)
+        return urllib.request.HTTPDigestAuthHandler.get_authorization (self, req, chal)
 
     def _encode_utf8(self, msg):
         """The MusicBrainz server also accepts UTF-8 encoded passwords."""
@@ -439,10 +442,10 @@ def get_algorithm_impls(self, algorithm):
         KD = lambda s, d: H("%s:%s" % (s, d))
         return H, KD
 
-class _MusicbrainzHttpRequest(compat.Request):
+class _MusicbrainzHttpRequest(urllib.request.Request):
     """ A custom request handler that allows DELETE and PUT"""
     def __init__(self, method, url, data=None):
-        compat.Request.__init__(self, url, data)
+        urllib.request.Request.__init__(self, url, data)
         allowed_m = ["GET", "POST", "DELETE", "PUT"]
         if method not in allowed_m:
             raise ValueError("invalid method: %s" % method)
@@ -473,7 +476,7 @@ def _safe_read(opener, req, body=None, max_retries=8, retry_delay_delta=2.0):
                 f = opener.open(req)
             return f.read()
 
-        except compat.HTTPError as exc:
+        except urllib.error.HTTPError as exc:
             if exc.code in (400, 404, 411):
                 # Bad request, not found, etc.
                 raise ResponseError(cause=exc)
@@ -487,13 +490,13 @@ def _safe_read(opener, req, body=None, max_retries=8, retry_delay_delta=2.0):
                 # retrying for now.
                 _log.info("unknown HTTP error %i" % exc.code)
             last_exc = exc
-        except compat.BadStatusLine as exc:
+        except http.client.BadStatusLine as exc:
             _log.info("bad status line")
             last_exc = exc
-        except compat.HTTPException as exc:
+        except http.client.HTTPException as exc:
             _log.info("miscellaneous HTTP exception: %s" % str(exc))
             last_exc = exc
-        except compat.URLError as exc:
+        except urllib.error.URLError as exc:
             if isinstance(exc.reason, socket.error):
                 code = exc.reason.errno
                 if code == 104: # "Connection reset by peer."
@@ -502,11 +505,11 @@ def _safe_read(opener, req, body=None, max_retries=8, retry_delay_delta=2.0):
         except socket.timeout as exc:
             _log.info("socket timeout")
             last_exc = exc
-        except socket.error as exc:
+        except OSError as exc:
             if exc.errno == 104:
                 continue
             raise NetworkError(cause=exc)
-        except IOError as exc:
+        except OSError as exc:
             raise NetworkError(cause=exc)
 
     # Out of retries!
@@ -612,24 +615,24 @@ def _mb_request(path, method='GET', auth_required=AUTH_NO,
     # Encode Unicode arguments using UTF-8.
     newargs = []
     for key, value in sorted(args.items()):
-        if isinstance(value, compat.unicode):
+        if isinstance(value, str):
             value = value.encode('utf8')
         newargs.append((key, value))
 
     # Construct the full URL for the request, including hostname and
     # query string.
-    url = compat.urlunparse((
+    url = urllib.parse.urlunparse((
         'http',
         hostname,
         '/ws/2/%s' % path,
         '',
-        compat.urlencode(newargs),
+        urllib.parse.urlencode(newargs),
         ''
     ))
     _log.debug("%s request for %s" % (method, url))
 
     # Set up HTTP request handler and URL opener.
-    httpHandler = compat.HTTPHandler(debuglevel=0)
+    httpHandler = urllib.request.HTTPHandler(debuglevel=0)
     handlers = [httpHandler]
 
     # Add credentials if required.
@@ -651,7 +654,7 @@ def _mb_request(path, method='GET', auth_required=AUTH_NO,
         authHandler.add_password("musicbrainz.org", (), user, password)
         handlers.append(authHandler)
 
-    opener = compat.build_opener(*handlers)
+    opener = urllib.request.build_opener(*handlers)
 
     # Make request.
     req = _MusicbrainzHttpRequest(method, url, data)
@@ -1018,7 +1021,7 @@ def get_recordings_by_echoprint(echoprint, includes=[], release_status=[],
     warn("Echoprints were never introduced\n"
          "and will not be found (404)",
          Warning, stacklevel=2)
-    raise ResponseError(cause=compat.HTTPError(
+    raise ResponseError(cause=urllib.error.HTTPError(
                                             None, 404, "Not Found", None, None))
 
 @_docstring('recording')
@@ -1029,7 +1032,7 @@ def get_recordings_by_puid(puid, includes=[], release_status=[],
     warn("PUID support was removed from the server\n"
          "and no PUIDs will be found (404)",
          Warning, stacklevel=2)
-    raise ResponseError(cause=compat.HTTPError(
+    raise ResponseError(cause=urllib.error.HTTPError(
                                             None, 404, "Not Found", None, None))
 
 @_docstring('recording')
diff --git a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/util.py b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/util.py
index 93ccca509d8..09d914f2bfd 100644
--- a/mythtv/programs/scripts/metadata/Music/musicbrainzngs/util.py
+++ b/mythtv/programs/scripts/metadata/Music/musicbrainzngs/util.py
@@ -3,20 +3,19 @@
 # This file is distributed under a BSD-2-Clause type license.
 # See the COPYING file for more information.
 
+import io
 import sys
 import locale
 import xml.etree.ElementTree as ET
 
-from . import compat
-
 def _unicode(string, encoding=None):
     """Try to decode byte strings to unicode.
     This can only be a guess, but this might be better than failing.
     It is safe to use this on numbers or strings that are already unicode.
     """
-    if isinstance(string, compat.unicode):
+    if isinstance(string, str):
         unicode_string = string
-    elif isinstance(string, compat.bytes):
+    elif isinstance(string, bytes):
         # use given encoding, stdin, preferred until something is not None is found
         if encoding is None:
             encoding = sys.stdin.encoding
@@ -24,21 +23,20 @@ def _unicode(string, encoding=None):
             encoding = locale.getpreferredencoding()
         unicode_string = string.decode(encoding, "ignore")
     else:
-        unicode_string = compat.unicode(string)
+        unicode_string = str(string)
     return unicode_string.replace('\x00', '').strip()
 
 def bytes_to_elementtree(bytes_or_file):
     """Given a bytestring or a file-like object that will produce them,
        parse and return an ElementTree.
     """
-    if isinstance(bytes_or_file, compat.basestring):
+    if isinstance(bytes_or_file, (str, bytes)):
         s = bytes_or_file
     else:
         s = bytes_or_file.read()
 
-    if compat.is_py3:
-        s = _unicode(s, "utf-8")
+    s = _unicode(s, "utf-8")
 
-    f = compat.StringIO(s)
+    f = io.StringIO(s)
     tree = ET.ElementTree(file=f)
     return tree
diff --git a/mythtv/programs/scripts/metadata/Television/tmdb3tv.py b/mythtv/programs/scripts/metadata/Television/tmdb3tv.py
index 575ad436fa7..db8ee18f195 100755
--- a/mythtv/programs/scripts/metadata/Television/tmdb3tv.py
+++ b/mythtv/programs/scripts/metadata/Television/tmdb3tv.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 # ----------------------
 # Name: tmdb3tv.py
 # Python Script
@@ -66,7 +65,7 @@ def main(showType, command):
     parser.add_option("-N", "--numbers", action="store_true", default=False, dest="numbers",
                         help="Get television Season and Episode numbers. " \
                         "Needs title and subtitle or inetref and subtitle.")
-    parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
+    parser.add_option('-l', "--language", metavar="LANGUAGE", default='en',
                       dest="language", help="Specify language for filtering.")
     parser.add_option('-a', "--area", metavar="COUNTRY", default=None,
                       dest="country", help="Specify country for custom data.")
diff --git a/mythtv/programs/scripts/metadata/Television/ttvdb4.py b/mythtv/programs/scripts/metadata/Television/ttvdb4.py
index 487d6dede9b..df23332ac40 100755
--- a/mythtv/programs/scripts/metadata/Television/ttvdb4.py
+++ b/mythtv/programs/scripts/metadata/Television/ttvdb4.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 
 # ----------------------------------------------------
 # Purpose:   MythTV Python Bindings for TheTVDB v4 API
@@ -40,7 +39,7 @@ def _parse_config(config):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "thumbnail").text = 'ttvdb.png'
@@ -118,7 +117,7 @@ def main():
     parser.add_argument('-t', '--test', action="store_true", default=False,
                          dest="test", help="Perform self-test for dependencies.")
 
-    parser.add_argument('-l', "--language", metavar="LANGUAGE", default=u'en',
+    parser.add_argument('-l', "--language", metavar="LANGUAGE", default='en',
                         dest="language", help="Specify language for filtering.")
 
     parser.add_argument('-a', "--area", metavar="COUNTRY", default=None,
@@ -242,7 +241,7 @@ def main():
             with open("ttvdb4_doctests") as f:
                 dtests = "".join(f.readlines())
             main.__doc__ += dtests
-        except IOError:
+        except OSError:
             pass
         # perhaps try optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE
         return doctest.testmod(verbose=args.debug, optionflags=doctest.ELLIPSIS)
diff --git a/mythtv/programs/scripts/metadata/Television/tvmaze.py b/mythtv/programs/scripts/metadata/Television/tvmaze.py
index 4e72206348d..ed838d3958f 100755
--- a/mythtv/programs/scripts/metadata/Television/tvmaze.py
+++ b/mythtv/programs/scripts/metadata/Television/tvmaze.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: UTF-8 -*-
 
 __title__ = "TVmaze.com"
 __author__ = "Roland Ernst, Steve Erlenborn"
@@ -88,7 +87,7 @@ def buildList(tvtitle, opts):
             for k, v in l.__dict__.items():
                 print(k, " : ", v)
 
-    tree = etree.XML(u'<metadata></metadata>')
+    tree = etree.XML('<metadata></metadata>')
 
     for show_info in showlist:
         m = VideoMetadata()
@@ -214,7 +213,7 @@ def buildNumbers(args, opts):
 
     matchesFound = 0
     best_ep_quality = 0.5   # require at least this quality on string match
-    tree = etree.XML(u'<metadata></metadata>')
+    tree = etree.XML('<metadata></metadata>')
     for inetref in inetrefList:
         dtInTgtZone = None
         if dtInLocalZone:
@@ -323,7 +322,7 @@ def buildNumbers(args, opts):
                             print('"%s" added to best list, match_quality = %g' % (ep.name, match_quality))
                     else:
                         # Any items previously appended for a lesser match need to be eliminated
-                        tree = etree.XML(u'<metadata></metadata>')
+                        tree = etree.XML('<metadata></metadata>')
                         min_dist_list = [i]
                         best_ep_quality = match_quality
                         if opts.debug:
@@ -402,7 +401,7 @@ def buildSingle(args, opts, tvmaze_episode_id=None):
                 break
 
     # build xml:
-    tree = etree.XML(u'<metadata></metadata>')
+    tree = etree.XML('<metadata></metadata>')
     item = buildSingleItem(inetref, season, tvmaze_episode_id)
     if item is not None:
         tree.append(item.toXML())
@@ -538,7 +537,7 @@ def buildCollection(tvinetref, opts):
         for k, v in show_info.__dict__.items():
             print(k, " : ", v)
 
-    tree = etree.XML(u'<metadata></metadata>')
+    tree = etree.XML('<metadata></metadata>')
     m = VideoMetadata()
     m.title = check_item(m, ("title", show_info.name), ignore=False)
     m.description = check_item(m, ("description", show_info.summary))
@@ -598,7 +597,7 @@ def buildCollection(tvinetref, opts):
 
 def buildVersion():
     from lxml import etree
-    version = etree.XML(u'<grabber></grabber>')
+    version = etree.XML('<grabber></grabber>')
     etree.SubElement(version, "name").text = __title__
     etree.SubElement(version, "author").text = __author__
     etree.SubElement(version, "thumbnail").text = 'tvmaze.png'
@@ -666,7 +665,7 @@ def main():
                       dest="collectiondata", help="Get Collection data.")
     parser.add_option('-N', "--numbers", action="store_true", default=False,
                       dest="tvnumbers", help="Get Season and Episode numbers")
-    parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
+    parser.add_option('-l', "--language", metavar="LANGUAGE", default='en',
                       dest="language", help="Specify language for filtering.")
     parser.add_option('-a', "--area", metavar="COUNTRY", default=None,
                       dest="country", help="Specify country for custom data.")
@@ -688,7 +687,7 @@ def main():
             with open("tvmaze_tests.txt") as f:
                 dtests = "".join(f.readlines())
             main.__doc__ += dtests
-        except IOError:
+        except OSError:
             pass
         # perhaps try optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE
         doctest.testmod(verbose=opts.debug, optionflags=doctest.ELLIPSIS)
diff --git a/mythtv/programs/scripts/python_pathfix.py b/mythtv/programs/scripts/python_pathfix.py
index 9533c5b6fc7..099cd883450 100755
--- a/mythtv/programs/scripts/python_pathfix.py
+++ b/mythtv/programs/scripts/python_pathfix.py
@@ -2,8 +2,6 @@
 # python_pathfix - adjust python shebang paths
 #
 
-from __future__ import print_function
-from __future__ import unicode_literals
 import sys
 import os
 from stat import ST_MODE
@@ -74,17 +72,17 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
     # open input file
     try:
         infile = open(filename, 'rb')
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: open failed: %r\n' % (filename, msg))
         return 1
     # process first line
     try:
         firstline = infile.readline()
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: read failed: %r\n' % (filename, msg))
         try:
             infile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
         return 1
     if firstline.rstrip(b'\n').find(b' -') != -1:
@@ -97,7 +95,7 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
             sys.stdout.write('%s: unchanged\n' % (filename))
         try:
             infile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
         return 0
     # create temporary output
@@ -105,11 +103,11 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
     tempname = os.path.join(head, '@' + tail)
     try:
         outfile = open(tempname, 'wb')
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: create failed: %r\n' % (tempname, msg))
         try:
             infile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
         return 1
     if verbose:
@@ -117,30 +115,30 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
     # write first new line to temporary output
     try:
         outfile.write(newline)
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: write failed: %r\n' % (tempname, msg))
         try:
             infile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
         try:
             outfile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (tempname, msg))
         return 1
     # copy rest of file
     while True:
         try:
             chunk = infile.read(32678)
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: read failed: %r\n' % (filename, msg))
             try:
                 infile.close()
-            except IOError as msg:
+            except OSError as msg:
                 sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
             try:
                 outfile.close()
-            except IOError as msg:
+            except OSError as msg:
                 sys.stderr.write('%s: close failed: %r\n' % (tempname, msg))
             try:
                 os.remove(tempname)
@@ -151,15 +149,15 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
             break
         try:
             outfile.write(chunk)
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: write failed: %r\n' % (tempname, msg))
             try:
                 infile.close()
-            except IOError as msg:
+            except OSError as msg:
                 sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
             try:
                 outfile.close()
-            except IOError as msg:
+            except OSError as msg:
                 sys.stderr.write('%s: close failed: %r\n' % (tempname, msg))
             try:
                 os.remove(tempname)
@@ -169,11 +167,11 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
     # close files
     try:
         infile.close()
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: close failed: %r\n' % (filename, msg))
         try:
             outfile.close()
-        except IOError as msg:
+        except OSError as msg:
             sys.stderr.write('%s: close failed: %r\n' % (tempname, msg))
         try:
             os.remove(tempname)
@@ -182,7 +180,7 @@ def pathfix(filename=None, verbose=False, python_interpreter='/usr/bin/python'):
         return 1
     try:
         outfile.close()
-    except IOError as msg:
+    except OSError as msg:
         sys.stderr.write('%s: close failed: %r\n' % (tempname, msg))
         try:
             os.remove(tempname)
diff --git a/platform/win32/msvc/external/exiv2/msvc64/runner.py b/platform/win32/msvc/external/exiv2/msvc64/runner.py
index aa2b9000463..1c0cee10380 100644
--- a/platform/win32/msvc/external/exiv2/msvc64/runner.py
+++ b/platform/win32/msvc/external/exiv2/msvc64/runner.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: Latin-1 -*-
 
 ##
 def syntax():
diff --git a/platform/win32/msvc/external/exiv2/msvc64/setbuild.py b/platform/win32/msvc/external/exiv2/msvc64/setbuild.py
index dae2ebd7759..7fc9767d976 100644
--- a/platform/win32/msvc/external/exiv2/msvc64/setbuild.py
+++ b/platform/win32/msvc/external/exiv2/msvc64/setbuild.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: Latin-1 -*-
 
 """   setbuild - set the build environment you require  """