Ticket #13562: mytharchive_python3_compatibility.patch

mythplugins/mytharchive/mytharchive/mythburn.cpp

@@ -29 +29 @@
 #include <mythsystemlegacy.h>
 #include <mythmiscutil.h>
 #include <exitcodes.h>
+#include <mythconfig.h>
 
 // mytharchive
 #include "archiveutil.h"
@@ -909 +910 @@
         QFile::remove(logDir + "/mythburncancel.lck");
 
     createConfigFile(configDir + "/mydata.xml");
-    commandline = "python " + GetShareDir() + "mytharchive/scripts/mythburn.py";
+    commandline = PYTHON_EXE;
+    commandline += " " + GetShareDir() + "mytharchive/scripts/mythburn.py";
     commandline += " -j " + configDir + "/mydata.xml";          // job file
     commandline += " -l " + logDir + "/progress.log";           // progress log
     commandline += " > "  + logDir + "/mythburn.log 2>&1 &";    // Logs

mythplugins/mytharchive/mythburn/scripts/mythburn.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+# python 3 doesn't have a unicode type
+try:
+    unicode
+except:
+    unicode = str
+
+# python 3 doesn't have a long type
+try:
+    long
+except:
+    long = int
+
+
 # mythburn.py
 # The ported MythBurn scripts which feature:
 
@@ -49 +62 @@
 
 
 # version of script - change after each update
-VERSION="0.1.20131119-1"
+VERSION="0.2.2020017-1"
 
 # keep all temporary files for debugging purposes
 # set this to True before a first run through when testing
@@ -155 +168 @@
 #main menu aspect ratio (4:3 or 16:9)
 mainmenuAspectRatio = "16:9"
 
-#chapter menu aspect ratio (4:3, 16:9 or Video) 
+#chapter menu aspect ratio (4:3, 16:9 or Video)
 #video means same aspect ratio as the video title
 chaptermenuAspectRatio = "Video"
 
@@ -505 +518 @@
     command = quoteCmdArg(path_jpeg2yuv[0]) + " -n %s -v0 -I p -f %s -j %s | %s -b 5000 -a %s -v 1 -f 8 -o %s" \
               % (totalframes, framespersecond, quoteCmdArg(background), quoteCmdArg(path_mpeg2enc[0]), aspectratio, quoteCmdArg(tempvideo))
     result = runCommand(command)
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running jpeg2yuv - %s" % command)
 
     command = quoteCmdArg(path_mplex[0]) + " -f 8 -v 0 -o %s %s %s" % (quoteCmdArg(tempmovie), quoteCmdArg(tempvideo), quoteCmdArg(music))
     result = runCommand(command)
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running mplex - %s" % command)
 
     if xmlfile != "":
         command = quoteCmdArg(path_spumux[0]) + " -m dvd -s 0 %s < %s > %s" % (quoteCmdArg(xmlfile), quoteCmdArg(tempmovie), quoteCmdArg(finaloutput))
         result = runCommand(command)
-        if result<>0:
+        if result!=0:
             fatalError("Failed while running spumux - %s" % command)
     else:
         os.rename(tempmovie, finaloutput)
@@ -527 +540 @@
             os.remove(tempmovie)
 
 #############################################################
-# Return an xml node from a re-encoding profile xml file for 
+# Return an xml node from a re-encoding profile xml file for
 # a given profile name
 
 def findEncodingProfile(profile):
@@ -606 +619 @@
     return duration
 
 #############################################################
-# Gets the audio sample rate and number of channels of a video file 
+# Gets the audio sample rate and number of channels of a video file
 # from its stream info file
 
 def getAudioParams(folder):
@@ -643 +656 @@
     if video.attributes["aspectratio"].value != 'N/A':
         aspect_ratio = video.attributes["aspectratio"].value
     else:
-        aspect_ratio = "1.77778" 
+        aspect_ratio = "1.77778"
 
     videores = video.attributes["width"].value + 'x' + video.attributes["height"].value
     fps = video.attributes["fps"].value
@@ -801 +814 @@
 #############################################################
 # Creates some fixed length chapter marks
 
-def createVideoChaptersFixedLength(itemnum, segment, lengthofvideo): 
-    """Returns chapter marks at cut list ends, 
+def createVideoChaptersFixedLength(itemnum, segment, lengthofvideo):
+    """Returns chapter marks at cut list ends,
        or evenly spaced chapters 'segment' seconds through the file"""
 
 
@@ -845 +858 @@
     sqlstatement="""SELECT value, data FROM settings WHERE value IN(
                         'DBSchemaVer',
                         'ISO639Language0',
-                        'ISO639Language1') 
+                        'ISO639Language1')
                     OR (hostname=%s AND value IN(
                         'VideoStartupDir',
                         'GalleryDir',
@@ -994 +1007 @@
     #write("containerWidth: %s" % containerWidth)
     words = text.split()
     lines = [] # prepare a return argument
-    lines.append(words) 
+    lines.append(words)
     finished = False
     line = 0
     while not finished:
@@ -1008 +1021 @@
             if drawer.textsize(' '.join(thistext),font.getFont())[0] > containerWidth:
                 # this is the heart of the algorithm: we pop words off the current
                 # sentence until the width is ok, then in the next outer loop
-                # we move on to the next sentence. 
+                # we move on to the next sentence.
                 if str(thistext).find(' ') != -1:
                     newline.insert(0,thistext.pop(-1))
                 else:
@@ -1133 +1146 @@
 #############################################################
 # Paint some theme text on to an image
 
-def paintText(draw, image, text, node, color = None, 
+def paintText(draw, image, text, node, color = None,
               x = None, y = None, width = None, height = None):
     """Takes a piece of text and draws it onto an image inside a bounding box."""
     #The text is wider than the width of the bounding box
 
     if x == None:
-        x = getScaledAttribute(node, "x") 
+        x = getScaledAttribute(node, "x")
         y = getScaledAttribute(node, "y")
         width = getScaledAttribute(node, "w")
         height = getScaledAttribute(node, "h")
@@ -1230 +1243 @@
     (imgw, imgh) = picture.size
     write("Image (%s, %s) into space of (%s, %s) at (%s, %s)" % (imgw, imgh, w, h, xpos, ypos), False)
 
-    # the theme can override the default stretch behaviour 
-    if imageDom.hasAttribute("stretch"): 
+    # the theme can override the default stretch behaviour
+    if imageDom.hasAttribute("stretch"):
         if imageDom.attributes["stretch"].value == "True":
             stretch = True
         else:
@@ -1272 +1285 @@
     picture = picture.resize((imgw, imgh))
     picture = picture.convert("RGBA")
 
-    if maskfilename <> None and doesFileExist(maskfilename):
+    if maskfilename != None and doesFileExist(maskfilename):
         maskpicture = Image.open(maskfilename, "r").resize((imgw, imgh))
         maskpicture = maskpicture.convert("RGBA")
     else:
@@ -1280 +1293 @@
 
     destimage.paste(picture, (xpos, ypos), maskpicture)
     del picture
-    if maskfilename <> None and doesFileExist(maskfilename):
+    if maskfilename != None and doesFileExist(maskfilename):
         del maskpicture
 
     write ("Added image %s" % filename)
@@ -1294 +1307 @@
 def checkBoundaryBox(boundarybox, node):
     # We work out how much space all of our graphics and text are taking up
     # in a bounding rectangle so that we can use this as an automatic highlight
-    # on the DVD menu   
+    # on the DVD menu
     if getText(node.attributes["static"]) == "False":
         if getScaledAttribute(node, "x") < boundarybox[0]:
             boundarybox = getScaledAttribute(node, "x"), boundarybox[1], boundarybox[2], boundarybox[3]
@@ -1389 +1402 @@
         if file.attributes["type"].value=="recording":
             filename = file.attributes["filename"].value
             try:
-                rec = DB.searchRecorded(basename=os.path.basename(filename)).next()
+                rec = next(DB.searchRecorded(basename=os.path.basename(filename)))
             except StopIteration:
                 fatalError("Failed to get recording details from the DB for %s" % filename)
 
@@ -1412 +1425 @@
     elif file.attributes["type"].value=="recording":
         filename = file.attributes["filename"].value
         try:
-            rec = DB.searchRecorded(basename=os.path.basename(filename)).next()
+            rec = next(DB.searchRecorded(basename=os.path.basename(filename)))
         except StopIteration:
             fatalError("Failed to get recording details from the DB for %s" % filename)
 
@@ -1443 +1456 @@
     elif file.attributes["type"].value=="video":
         filename = file.attributes["filename"].value
         try:
-            vid = MVID.searchVideos(file=filename).next()
+            vid = next(MVID.searchVideos(file=filename))
         except StopIteration:
             vid = Video.fromFilename(filename)
 
@@ -1489 +1502 @@
 
         data.thumblist = ','.join(thumblist)
 
-    for k,v in data.items():
+    for k,v in list(data.items()):
         write( "Node = %s, Data = %s" % (k, v))
         node = infoDOM.createElement(k)
         # v may be either an integer. Therefore we have to
@@ -1588 +1601 @@
 
     write("Multiplexing MPEG stream to %s" % destination)
 
-    # no need to use a sync offset if projectx was used to demux the streams 
+    # no need to use a sync offset if projectx was used to demux the streams
     if useprojectx:
         syncOffset = 0
     else:
@@ -1663 +1676 @@
         write("Checking integrity of subtitle pngs")
         command = quoteCmdArg(os.path.join(scriptpath, "testsubtitlepngs.sh")) + " " + quoteCmdArg(os.path.dirname(destination) + "/stream.d/spumux.xml")
         result = runCommand(command)
-        if result<>0:
+        if result!=0:
             fatalError("Failed while running testsubtitlepngs.sh - %s" % command)
 
         write("Running spumux to add subtitles")
         command = quoteCmdArg(path_spumux[0]) + " -P %s <%s >%s" % (quoteCmdArg(os.path.dirname(destination) + "/stream.d/spumux.xml"), quoteCmdArg(destination), quoteCmdArg(os.path.splitext(destination)[0] + "-sub.mpg"))
         result = runCommand(command)
-        if result<>0:
+        if result!=0:
             nonfatalError("Failed while running spumux.\n"
                           "Command was - %s.\n"
                           "Look in the full log to see why it failed" % command)
@@ -1691 +1704 @@
 
     result = runCommand(command)
 
-    if result <> 0:
+    if result != 0:
         fatalError("Failed while running mytharchivehelper to get stream information.\n"
                    "Result: %d, Command was %s" % (result, command))
 
@@ -1730 +1743 @@
     """Use mythtranscode to cut commercials and/or clean up an mpeg2 file"""
 
     try:
-        rec = DB.searchRecorded(chanid=chanid, starttime=starttime).next()
+        rec = next(DB.searchRecorded(chanid=chanid, starttime=starttime))
         cutlist = rec.markup.getcutlist()
     except StopIteration:
         cutlist = []
@@ -1770 +1783 @@
 def generateProjectXCutlist(chanid, starttime, folder):
     """generate cutlist_x.txt for ProjectX"""
 
-    rec = DB.searchRecorded(chanid=chanid, starttime=starttime).next()
+    rec = next(DB.searchRecorded(chanid=chanid, starttime=starttime))
     starttime = rec.starttime.utcisoformat()
     cutlist = rec.markup.getcutlist()
 
@@ -1781 +1794 @@
             for cut in cutlist:
                 # we need to reverse the cutlist because ProjectX wants to know
                 # the bits to keep not what to cut
-                
+
                 if i == 0:
                     if cut[0] != 0:
                         cutlist_f.write('0\n%d\n' % cut[0])
@@ -1979 +1992 @@
 
         command = "mytharchivehelper -q -q --createthumbnail --infile %s --thumblist '%s' --outfile %s" % (quoteCmdArg(source), seconds, quoteCmdArg(destination))
         result = runCommand(command)
-        if result <> 0:
+        if result != 0:
             fatalError("Failed while running mytharchivehelper to get thumbnails.\n"
                        "Result: %d, Command was %s" % (result, command))
     try:
         myimage=Image.open(destination,"r")
 
-        if myimage.format <> "JPEG":
+        if myimage.format != "JPEG":
             write( "Something went wrong with thumbnail capture - " + myimage.format)
-            return (0L,0L)
+            return (long(0),long(0))
         else:
             return myimage.size
     except IOError:
-        return (0L, 0L)
+        return (long(0),long(0))
 
 #############################################################
 # Grabs a list of single frames from a file
@@ -2003 +2016 @@
     command = "mytharchivehelper -q -q --createthumbnail --infile %s --thumblist '%s' --outfile %s" % (quoteCmdArg(source), thumbList, quoteCmdArg(destination))
     write(command)
     result = runCommand(command)
-    if result <> 0:
+    if result != 0:
         fatalError("Failed while running mytharchivehelper to get thumbnails.\n"
                    "Result: %d, Command was %s" % (result, command))
 
@@ -2117 +2130 @@
     profileNode = findEncodingProfile(profile)
     parameters = profileNode.getElementsByTagName("parameter")
 
-    # default values - will be overriden by values from the profile 
+    # default values - will be overriden by values from the profile
     outvideobitrate = "5000k"
     if videomode == "ntsc":
         outvideores = "720x480"
@@ -2198 +2211 @@
     if cpuCount > 1:
         command += "-threads %d " % cpuCount
 
-    command += "-f s16le -ar %s -ac %s -i %s " % (samplerate, channels, quoteCmdArg(os.path.join(folder, "audout"))) 
+    command += "-f s16le -ar %s -ac %s -i %s " % (samplerate, channels, quoteCmdArg(os.path.join(folder, "audout")))
     command += "-f rawvideo -pix_fmt yuv420p -s %s -aspect %s -r %s " % (videores, aspectratio, fps)
     command += "-i %s " % quoteCmdArg(os.path.join(folder, "vidout"))
     command += "-aspect %s -r %s " % (aspectratio, fps)
@@ -2235 +2248 @@
     write( "Starting dvdauthor")
     checkCancelFlag()
     result=os.spawnlp(os.P_WAIT, path_dvdauthor[0],path_dvdauthor[1],'-x',os.path.join(getTempPath(),'dvdauthor.xml'))
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running dvdauthor. Result: %d" % result)
     write( "Finished  dvdauthor")
 
@@ -2252 +2265 @@
 
     result = runCommand(command)
 
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running mkisofs.\n"
                    "Command was %s" % command)
 
     write("Finished creating ISO image")
 
 #############################################################
-# Burns the contents of a directory to create a DVD 
+# Burns the contents of a directory to create a DVD
 
 
 def BurnDVDISO(title):
@@ -2314 +2327 @@
             except:
               write("Sending command ", action, " to drive failed", False)
               res = False
-            os.close(f) 
-        return res 
+            os.close(f)
+        return res
     def waitForDrive():
         tries = 0
         while drivestatus() == CDROM.CDS_DRIVE_NOT_READY:
@@ -2363 +2376 @@
             result = runCommand(command)
             if result == 0:
                 finished = True
-                
+
                 # Wait till the drive is not busy any longer
                 f = os.open(dvddrivepath, os.O_RDONLY | os.O_NONBLOCK)
                 busy = True
@@ -2427 +2440 @@
         command = "mythreplex --demux --fix_sync -t TS -o %s " % quoteCmdArg(folder + "/stream")
         command += "-v %d " % (video[VIDEO_ID])
 
-        if audio1[AUDIO_ID] != -1: 
+        if audio1[AUDIO_ID] != -1:
             if audio1[AUDIO_CODEC] == 'MP2':
                 command += "-a %d " % (audio1[AUDIO_ID])
             elif audio1[AUDIO_CODEC] == 'AC3':
@@ -2435 +2448 @@
             elif audio1[AUDIO_CODEC] == 'EAC3':
                 command += "-c %d " % (audio1[AUDIO_ID])
 
-        if audio2[AUDIO_ID] != -1: 
+        if audio2[AUDIO_ID] != -1:
             if audio2[AUDIO_CODEC] == 'MP2':
                 command += "-a %d " % (audio2[AUDIO_ID])
             elif audio2[AUDIO_CODEC] == 'AC3':
@@ -2447 +2460 @@
         command = "mythreplex --demux --fix_sync -o %s " % quoteCmdArg(folder + "/stream")
         command += "-v %d " % (video[VIDEO_ID] & 255)
 
-        if audio1[AUDIO_ID] != -1: 
+        if audio1[AUDIO_ID] != -1:
             if audio1[AUDIO_CODEC] == 'MP2':
                 command += "-a %d " % (audio1[AUDIO_ID] & 255)
             elif audio1[AUDIO_CODEC] == 'AC3':
@@ -2456 +2469 @@
                 command += "-c %d " % (audio1[AUDIO_ID] & 255)
 
 
-        if audio2[AUDIO_ID] != -1: 
+        if audio2[AUDIO_ID] != -1:
             if audio2[AUDIO_CODEC] == 'MP2':
                 command += "-a %d " % (audio2[AUDIO_ID] & 255)
             elif audio2[AUDIO_CODEC] == 'AC3':
@@ -2470 +2483 @@
 
     result = runCommand(command)
 
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running mythreplex. Command was %s" % command)
 
 #############################################################
@@ -2486 +2499 @@
     command += " %s "  % M2Vsize0
     command += " <  %s " % quoteCmdArg(source)
     command += " >  %s " % quoteCmdArg(destination)
- 
+
     write("Running: " + command)
     result = runCommand(command)
-    if result<>0:
+    if result!=0:
         fatalError("Failed while running M2VRequantiser. Command was %s" % command)
 
     M2Vsize1 = os.path.getsize(destination)
-       
+
     write("M2Vsize after requant is  %.2f Mb " % (float(M2Vsize1)/mega))
     fac1=float(M2Vsize0) / float(M2Vsize1)
     write("Factor demanded %.5f, achieved %.5f, ratio %.5f " % ( factor, fac1, fac1/factor))
 
 #############################################################
-# Calculates the total size of all the video, audio and menu files 
+# Calculates the total size of all the video, audio and menu files
 
 def calculateFileSizes(files):
     """ Returns the sizes of all video, audio and menu files"""
@@ -2515 +2528 @@
         #Process this file
         file=os.path.join(folder,"stream.mv2")
         #Get size of vobfile in MBytes
-        totalvideosize+=os.path.getsize(file) 
+        totalvideosize+=os.path.getsize(file)
 
         #Get size of audio track 1
         if doesFileExist(os.path.join(folder,"stream0.ac3")):
-            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream0.ac3")) 
+            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream0.ac3"))
         if doesFileExist(os.path.join(folder,"stream0.mp2")):
-            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream0.mp2")) 
+            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream0.mp2"))
 
-        #Get size of audio track 2 if available 
+        #Get size of audio track 2 if available
         if doesFileExist(os.path.join(folder,"stream1.ac3")):
-            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream1.ac3")) 
+            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream1.ac3"))
         if doesFileExist(os.path.join(folder,"stream1.mp2")):
-            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream1.mp2")) 
+            totalaudiosize+=os.path.getsize(os.path.join(folder,"stream1.mp2"))
 
         # add chapter menu if available
         if doesFileExist(os.path.join(getTempPath(),"chaptermenu-%s.mpg" % filecount)):
-            totalmenusize+=os.path.getsize(os.path.join(getTempPath(),"chaptermenu-%s.mpg" % filecount)) 
+            totalmenusize+=os.path.getsize(os.path.join(getTempPath(),"chaptermenu-%s.mpg" % filecount))
 
         # add details page if available
         if doesFileExist(os.path.join(getTempPath(),"details-%s.mpg" % filecount)):
@@ -2547 +2560 @@
 ########################################
 #returns total size of bitrate-limited m2v files
 
-def total_mv2_brl(files,rate): 
-    tvsize=0  
+def total_mv2_brl(files,rate):
+    tvsize=0
     filecount=0
     for node in files:
         filecount+=1
@@ -2557 +2570 @@
         file=os.path.join(folder,"stream.mv2")
         progvsize=os.path.getsize(file)
         progvbitrate=progvsize/progduration
-        if progvbitrate>rate : 
+        if progvbitrate>rate :
             tvsize+=progduration*rate
         else:
             tvsize+=progvsize
 
-    return tvsize    
+    return tvsize
 
 #########################################
-# Uses requantiser if available to shrink the video streams so 
+# Uses requantiser if available to shrink the video streams so
 # they will fit on a DVD
 
 def performMPEG2Shrink(files,dvdrsize):
@@ -2582 +2595 @@
 
     #Subtract the audio, menus and packaging overhead from the size of the disk (we cannot shrink this further)
     mv2space=((dvdrsize*mega-totalmenusize)/fudge_pack)-totalaudiosize
- 
+
     if mv2space<0:
         fatalError("Audio and menu files are too big. No room for video. Giving up!")
 
@@ -2602 +2615 @@
             vsize+=os.path.getsize(file)
             duration+=getLengthOfVideo(filecount)
 
-        #We need to shrink the video files to fit into the space available.  It seems sensible 
-        #to do this by imposing a common upper limit on the mean video bit-rate of each recording; 
+        #We need to shrink the video files to fit into the space available.  It seems sensible
+        #to do this by imposing a common upper limit on the mean video bit-rate of each recording;
         #this will not further reduce the visual quality of any that were transmitted at lower bit-rates.
 
-        #Now find the bit-rate limit by iteration between initially defined upper and lower bounds. 
+        #Now find the bit-rate limit by iteration between initially defined upper and lower bounds.
         #The code is based on 'rtbis' from Numerical Recipes by W H Press et al., CUP.
-        
+
         #A small multiple of the average input bit-rate should be ok as the initial upper bound,
         #(although a fixed value or one related to the max value could be used), and zero as the lower bound.
         #The function relating bit-rate upper limit to total file size is smooth and monotonic,
-        #so there should be no convergence problem. 
-     
+        #so there should be no convergence problem.
+
         vrLo=0.0
         vrHi=3.0*float(vsize)/duration
-        
+
         vrate=vrLo
         vrinc=vrHi-vrLo
         count=0
@@ -2628 +2641 @@
             testsize=total_mv2_brl(files,vrtest)
             if (testsize<mv2space):
                 vrate=vrtest
-           
+
         write("vrate %.3f kb/s, testsize %.4f , mv2space %.4f Mb " % ((vrate)/1000.0, (testsize)/mega, (mv2space)/mega) )
         filecount=0
         for node in files:
@@ -2775 +2788 @@
         #g4 holds the menu page last displayed
         pre = dvddom.createElement("pre")
         pre.appendChild(dvddom.createTextNode("{button=g2*1024;g4=%s;}" % page))
-        menupgc.appendChild(pre)    
+        menupgc.appendChild(pre)
 
         vob = dvddom.createElement("vob")
         vob.setAttribute("file",os.path.join(getTempPath(),"menu-%s.mpg" % page))
@@ -2833 +2846 @@
             elif chaptermenuAspectRatio == "16:9":
                 video.setAttribute("aspect", "16:9")
                 video.setAttribute("widescreen", "nopanscan")
-            else: 
+            else:
                 # use same aspect ratio as the video
                 if getAspectRatioOfVideo(itemnum) > aspectRatioThreshold:
                     video.setAttribute("aspect", "16:9")
@@ -2849 +2862 @@
 
                 pre = dvddom.createElement("pre")
                 mymenupgc.appendChild(pre)
-                if wantDetailsPage: 
+                if wantDetailsPage:
                     pre.appendChild(dvddom.createTextNode("{button=s7 - 1 * 1024;}"))
                 else:
                     pre.appendChild(dvddom.createTextNode("{button=s7 * 1024;}"))
 
                 vob = dvddom.createElement("vob")
                 vob.setAttribute("file",os.path.join(getTempPath(),"chaptermenu-%s.mpg" % itemnum))
-                mymenupgc.appendChild(vob)    
+                mymenupgc.appendChild(vob)
 
                 #Loop menu forever
                 post = dvddom.createElement("post")
                 post.appendChild(dvddom.createTextNode("jump cell 1;"))
                 mymenupgc.appendChild(post)
 
-                # the first chapter MUST be 00:00:00 if its not dvdauthor adds it which 
+                # the first chapter MUST be 00:00:00 if its not dvdauthor adds it which
                 # throws of the chapter selection - so make sure we add it if needed so we
-                # can compensate for it in the chapter selection menu 
+                # can compensate for it in the chapter selection menu
                 firstChapter = 0
                 thumblist = createVideoChapters(itemnum, chapters, getLengthOfVideo(itemnum), False)
                 chapterlist = string.split(thumblist, ",")
@@ -2876 +2889 @@
                     #Add this recording to this page's menu...
                     button = dvddom.createElement("button")
                     button.setAttribute("name","%s" % x)
-                    if wantDetailsPage: 
+                    if wantDetailsPage:
                         button.appendChild(dvddom.createTextNode("jump title %s chapter %s;" % (1, firstChapter + x + 1)))
                     else:
                         button.appendChild(dvddom.createTextNode("jump title %s chapter %s;" % (1, firstChapter + x)))
@@ -2938 +2951 @@
                     thumblist = '00:00:00,' + thumblist
                 vob.setAttribute("chapters", thumblist)
             else:
-                vob.setAttribute("chapters", 
+                vob.setAttribute("chapters",
                     createVideoChaptersFixedLength(itemnum,
-                                                   chapterLength, 
+                                                   chapterLength,
                                                    getLengthOfVideo(itemnum)))
 
             vob.setAttribute("file",os.path.join(getItemTempPath(itemnum),"final.vob"))
@@ -3006 +3019 @@
 
     pre = dvddom.createElement("pre")
     pre.appendChild(dvddom.createTextNode(dvdcode))
-    menupgc.appendChild(pre)    
+    menupgc.appendChild(pre)
 
     if wantIntro:
         #Menu creation is finished so we know how many pages were created
@@ -3018 +3031 @@
             dvdcode+="jump menu %s;" % (page + 1)
             if (page>1):
                 dvdcode+=" else "
-        dvdcode+="}"       
+        dvdcode+="}"
         vmgm_pre_node.appendChild(dvddom.createTextNode(dvdcode))
 
     #write(dvddom.toprettyxml())
@@ -3026 +3039 @@
     WriteXMLToFile (dvddom,os.path.join(getTempPath(),"dvdauthor.xml"))
 
     #Destroy the DOM and free memory
-    dvddom.unlink()   
+    dvddom.unlink()
 
 #############################################################
 # Creates the DVDAuthor xml file used to create a DVD with no main menu
@@ -3220 +3233 @@
     dvddom.unlink()
 
 #############################################################
-# Creates the directory to hold the preview images for an animated menu 
+# Creates the directory to hold the preview images for an animated menu
 
 def createEmptyPreviewFolder(videoitem):
     previewfolder = os.path.join(getItemTempPath(videoitem), "preview")
@@ -3264 +3277 @@
                 #see if this graphics item has a mask
                 if node.hasAttribute("mask"):
                     imagemaskfilename = getThemeFile(themeName, node.attributes["mask"].value)
-                    if node.attributes["mask"].value <> "" and doesFileExist(imagemaskfilename):
+                    if node.attributes["mask"].value != "" and doesFileExist(imagemaskfilename):
                         maskpicture = Image.open(imagemaskfilename,"r").resize((width, height))
                         maskpicture = maskpicture.convert("RGBA")
 
@@ -3276 +3289 @@
 def drawThemeItem(page, itemsonthispage, itemnum, menuitem, bgimage, draw,
                   bgimagemask, drawmask, highlightcolor, spumuxdom, spunode,
                   numberofitems, chapternumber, chapterlist):
-    """Draws text and graphics onto a dvd menu, called by 
+    """Draws text and graphics onto a dvd menu, called by
        createMenu and createChapterMenu"""
 
     #Get the XML containing information about this item
@@ -3287 +3300 @@
         fatalError("The info.xml file (%s) doesn't look right" %
                     os.path.join(getItemTempPath(itemnum),"info.xml"))
 
-    #boundarybox holds the max and min dimensions for this item 
+    #boundarybox holds the max and min dimensions for this item
     #so we can auto build a menu highlight box
     boundarybox = 9999,9999,0,0
     wantHighlightBox = True
@@ -3319 +3332 @@
 
                 # see if an image mask exists
                 maskfilename = None
-                if node.hasAttribute("mask") and node.attributes["mask"].value <> "":
+                if node.hasAttribute("mask") and node.attributes["mask"].value != "":
                     maskfilename = getThemeFile(themeName, node.attributes["mask"].value)
 
-                # if this is a thumb image and is a MythVideo coverart image then preserve 
+                # if this is a thumb image and is a MythVideo coverart image then preserve
                 # its aspect ratio unless overriden later by the theme
                 if (node.attributes["filename"].value == "%thumbnail"
                   and getText(infoDOM.getElementsByTagName("coverfile")[0]) !=""):
@@ -3366 +3379 @@
                 button.setAttribute("name","previous")
                 button.setAttribute("x0","%s" % getScaledAttribute(node, "x"))
                 button.setAttribute("y0","%s" % getScaledAttribute(node, "y"))
-                button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") + 
+                button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") +
                                                 getScaledAttribute(node, "w")))
                 button.setAttribute("y1","%s" % (getScaledAttribute(node, "y") +
                                                 getScaledAttribute(node, "h")))
@@ -3390 +3403 @@
                 button.setAttribute("name","next")
                 button.setAttribute("x0","%s" % getScaledAttribute(node, "x"))
                 button.setAttribute("y0","%s" % getScaledAttribute(node, "y"))
-                button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") + 
+                button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") +
                                                  getScaledAttribute(node, "w")))
-                button.setAttribute("y1","%s" % (getScaledAttribute(node, "y") + 
+                button.setAttribute("y1","%s" % (getScaledAttribute(node, "y") +
                                                  getScaledAttribute(node, "h")))
                 spunode.appendChild(button)
 
@@ -3411 +3424 @@
             button.setAttribute("name","playall")
             button.setAttribute("x0","%s" % getScaledAttribute(node, "x"))
             button.setAttribute("y0","%s" % getScaledAttribute(node, "y"))
-            button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") + 
+            button.setAttribute("x1","%s" % (getScaledAttribute(node, "x") +
                                              getScaledAttribute(node, "w")))
             button.setAttribute("y1","%s" % (getScaledAttribute(node, "y") +
                                              getScaledAttribute(node, "h")))
@@ -3426 +3439 @@
                 # draw background if required
                 paintBackground(bgimage, node)
 
-                paintButton(draw, bgimage, bgimagemask, node, infoDOM, 
-                            itemnum, page, itemsonthispage, chapternumber, 
+                paintButton(draw, bgimage, bgimagemask, node, infoDOM,
+                            itemnum, page, itemsonthispage, chapternumber,
                             chapterlist)
 
                 button = spumuxdom.createElement("button")
@@ -3621 +3634 @@
 
         #now that the base background has been made and all the previews generated
         #we need to add the previews to the background
-        #Assumption: We assume that there is nothing in the location of where the items go 
+        #Assumption: We assume that there is nothing in the location of where the items go
         #(ie, no text on the images)
 
         itemsonthispage = 0
@@ -3813 +3826 @@
             chapter+=1
 
             drawThemeItem(page, itemsperpage, page, menuitem,
-                        overlayimage, draw, 
+                        overlayimage, draw,
                         bgimagemask, drawmask, highlightcolor,
                         spumuxdom, spunode,
                         999, chapter, chapterlist)
@@ -3873 +3886 @@
             aspect_ratio = '2'
         elif chaptermenuAspectRatio == "16:9":
             aspect_ratio = '3'
-        else: 
+        else:
             if getAspectRatioOfVideo(page) > aspectRatioThreshold:
                 aspect_ratio = '3'
             else:
@@ -4043 +4056 @@
     return Magic=="RIFF"
 
 #############################################################
-# checks to see if an audio stream need to be converted to ac3 
+# checks to see if an audio stream need to be converted to ac3
 
 def processAudio(folder):
     """encode audio to ac3 for better compression and compatability with NTSC players"""
@@ -4454 +4467 @@
 
 #############################################################
 # process a single file ready for burning using mythtranscode/mythreplex
-# to cut and demux 
+# to cut and demux
 
 def doProcessFile(file, folder, count):
     """Process a single video/recording file ready for burning."""
@@ -4510 +4523 @@
                     write("Failed to run mythtranscode to remove unwanted segments")
             else:
                 #does the user always want to run recordings through mythtranscode?
-                #may help to fix any errors in the file 
-                if (alwaysRunMythtranscode == True or 
+                #may help to fix any errors in the file
+                if (alwaysRunMythtranscode == True or
                         (getFileType(folder) == "mpegts" and isFileOkayForDVD(file, folder))):
                     # Run from local file?
                     if file.hasAttribute("localfilename"):
@@ -4527 +4540 @@
                         write("Failed to run mythtranscode to fix any errors")
     else:
         #does the user always want to run mpeg2 files through mythtranscode?
-        #may help to fix any errors in the file 
+        #may help to fix any errors in the file
         write("File type is '%s'" % getFileType(folder))
         write("Video codec is '%s'" % getVideoCodec(folder))
 
@@ -4579 +4592 @@
                 mediafile = -1
                 chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
                 starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
-                usecutlist = (file.attributes["usecutlist"].value == "1" and 
+                usecutlist = (file.attributes["usecutlist"].value == "1" and
                             getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes")
             else:
                 chanid = -1
@@ -4612 +4625 @@
             else:
                 profile = defaultEncodingProfile
 
-            #do the re-encode 
+            #do the re-encode
             encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
                             audio1, audio2, aspectratio, profile)
             mediafile = os.path.join(folder, 'newfile2.mpg')
@@ -4677 +4690 @@
 
     #As part of this routine we need to pre-process the video this MAY mean:
     #1. encoding to mpeg2 (if its an avi for instance or isn't DVD compatible)
-    #2. removing commercials/cleaning up mpeg2 stream 
+    #2. removing commercials/cleaning up mpeg2 stream
     #3. selecting audio track(s) to use and encoding audio from mp2 into ac3
     #4. de-multiplexing into video and audio steams
 
@@ -4733 +4746 @@
                 mediafile = -1
                 chanid = getText(infoDOM.getElementsByTagName("chanid")[0])
                 starttime = getText(infoDOM.getElementsByTagName("starttime")[0])
-                usecutlist = (file.attributes["usecutlist"].value == "1" and 
+                usecutlist = (file.attributes["usecutlist"].value == "1" and
                             getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes")
             else:
                 chanid = -1
@@ -4766 +4779 @@
             else:
                 profile = defaultEncodingProfile
 
-            #do the re-encode 
+            #do the re-encode
             encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
                             audio1, audio2, aspectratio, profile)
             mediafile = os.path.join(folder, 'newfile2.mpg')
@@ -4787 +4800 @@
     # now attempt to split the source file into video and audio parts
     # using projectX
 
-    # If this is an mpeg2 myth recording and there is a cut list available and the 
+    # If this is an mpeg2 myth recording and there is a cut list available and the
     # user wants to use it run projectx to cut out commercials etc
     if file.attributes["type"].value == "recording":
         if file.attributes["usecutlist"].value == "1" and getText(infoDOM.getElementsByTagName("hascutlist")[0]) == "yes":
@@ -4995 +5008 @@
                 filecount+=1
                 folder=getItemTempPath(filecount)
                 #Multiplex this file
-                #(This also removes non-required audio feeds inside mpeg streams 
+                #(This also removes non-required audio feeds inside mpeg streams
                 #(through re-multiplexing) we only take 1 video and 1 or 2 audio streams)
                 pid=multiplexMPEGStream(os.path.join(folder,'stream.mv2'),
                         os.path.join(folder,'stream0'),
@@ -5238 +5251 @@
             except:
                 os.remove(lckpath)
                 raise
-        except OSError, e:
+        except OSError as e:
             if e.errno == errno.EEXIST:
                 write("Lock file exists -- already running???")
                 sys.exit(1)
@@ -5281 +5294 @@
             # remove our lock file
             os.remove(lckpath)
 
-            # make sure the files we created are read/writable by all 
+            # make sure the files we created are read/writable by all
             os.system("chmod -R a+rw-x+X %s" % defaultsettings["MythArchiveTempDir"])
     except SystemExit:
         write("Terminated")