Update all submodules and port repo_generator.py to Python 3

addons.py

@@ -1,4 +1,3 @@
-
 _BEAM_ = ["service.subtitles.titulky.com", "service.subtitles.serialzone.cz"]
 # list of addons that we are releasing
 
@@ -54,7 +53,7 @@
     "plugin.video.sl",
     "plugin.video.mall.tv",
     "plugin.video.bombuj.filmyserialy",
-    "plugin.video.stream-cinema"
+    "plugin.video.stream-cinema",
 ] + _BEAM_
 
 import os
@@ -67,25 +66,26 @@
 
 
 def find():
-    released_addons = requests.get('http://kodi-czsk.github.io/repository/repo/addons.xml').text
+    released_addons = requests.get("http://kodi-czsk.github.io/repository/repo/addons.xml").text
     try:
-        root = ET.XML(released_addons.encode('utf-8'))
+        root = ET.XML(released_addons.encode("utf-8"))
     except:  # initially there are no addons.xml
-        print 'Failed to parse remove addons.xml - releasing everything'
+        print("Failed to parse remove addons.xml - releasing everything")
         return __ADDONS__
     to_release = []
     for id in __ADDONS__:
-        released = root.find('addon[@id=\"%s\"]' % id)
+        released = root.find('addon[@id="%s"]' % id)
         if released == None:
             to_release.append(id)
             continue
-        released_version = released.get('version')
-        xmldoc = ET.parse(os.path.join(id, 'addon.xml'))
-        new_version = xmldoc.getroot().get('version')
+        released_version = released.get("version")
+        xmldoc = ET.parse(os.path.join(id, "addon.xml"))
+        new_version = xmldoc.getroot().get("version")
         if not released_version == new_version:
             to_release.append(id)
     return to_release
 
+
 if __name__ == "__main__":
     for id in find():
-        print "Addon %s " % id
+        print(f"Addon {id}")

repo_generator.py

@@ -1,74 +1,69 @@
-""" downloaded from http://xbmc-addons.googlecode.com/svn/addons/ """
+""" iownloaded from http://xbmc-addons.googlecode.com/svn/addons/ """
 """ addons.xml generator """
 
 import os
-import md5
+import hashlib
+
 from addons import __ADDONS__
 
+
 class Generator:
     """
-        Generates a new addons.xml file from each addons addon.xml file
-        and a new addons.xml.md5 hash file. Must be run from the root of
-        the checked-out repo. Only handles single depth folder structure.
+    Generates a new addons.xml file from each addons addon.xml file
+    and a new addons.xml.md5 hash file. Must be run from the root of
+    the checked-out repo. Only handles single depth folder structure.
     """
-    def __init__( self ):
+
+    def __init__(self):
         # generate files
         self._generate_addons_file()
         self._generate_md5_file()
         # notify user
-        print "Finished updating addons xml and md5 files"
+        print(f"Finished updating addons xml and md5 files")
 
-    def _generate_addons_file( self ):
+    def _generate_addons_file(self):
         # final addons text
-        addons_xml = u"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<addons>\n"
+        addons_xml = '<?xml version="1.0" encoding="UTF-8"?>\n<addons>\n'
         # loop thru and add each addons addon.xml file
         for addon in __ADDONS__:
             try:
                 # skip any file or .git folder
-                if ( not os.path.isdir( addon )): 
-                    print "Addon %s does not exist" % addon
+                if not os.path.isdir(addon):
+                    print(f"Addon {addon} does not exist")
                     continue
                 # create path
-                _path = os.path.join( addon, "addon.xml" )
+                _path = os.path.join(addon, "addon.xml")
                 # split lines for stripping
-                xml_lines = open( _path, "r" ).read().splitlines()
+                xml_lines = open(_path, "r").read().splitlines()
                 # new addon
                 addon_xml = ""
                 # loop thru cleaning each line
                 for line in xml_lines:
                     # skip encoding format line
-                    if ( line.find( "<?xml" ) >= 0 ): continue
+                    if line.find("<?xml") >= 0:
+                        continue
                     # add line
-                    addon_xml += unicode( line.rstrip() + "\n", "utf-8" )
+                    addon_xml += line.rstrip() + "\n"
                 # we succeeded so add to our final addons.xml text
                 addons_xml += addon_xml.rstrip() + "\n\n"
-            except Exception, e:
+            except Exception as e:
                 # missing or poorly formatted addon.xml
-                print "Excluding %s for %s" % ( _path, e, )
+                print(f"Excluding {_path} for {e}")
         # clean and add closing tag
-        addons_xml = addons_xml.strip() + u"\n</addons>\n"
+        addons_xml = addons_xml.strip() + "\n</addons>\n"
         # save file
-        self._save_file( addons_xml.encode( "utf-8" ), file="tmp/addons.xml" )
+        self._save_file(addons_xml, file="tmp/addons.xml")
 
-    def _generate_md5_file( self ):
-        try:
-            # create a new md5 hash
-            m = md5.new( open( "tmp/addons.xml" ).read() ).hexdigest()
-            # save file
-            self._save_file( m, file="tmp/addons.xml.md5" )
-        except Exception, e:
-            # oops
-            print "An error occurred creating addons.xml.md5 file!\n%s" % ( e, )
+    def _generate_md5_file(self):
+        # create a new md5 hash
+        m = hashlib.md5(open("tmp/addons.xml").read().encode("utf-8")).hexdigest()
+        self._save_file(m, file="tmp/addons.xml.md5")
 
-    def _save_file( self, data, file ):
-        try:
-            # write data to the file
-            open( file, "w" ).write( data )
-        except Exception, e:
-            # oops
-            print "An error occurred saving %s file!\n%s" % ( file, e, )
+    def _save_file(self, data, file):
+        with open(file, "w") as fp:
+            fp.write(data)
 
 
-if ( __name__ == "__main__" ):
+if __name__ == "__main__":
     # start
     Generator()

tools/bump_addon

@@ -1,23 +1,23 @@
 #!/usr/bin/env python
 
-import sys,os
+import sys, os
 import xml.etree.ElementTree as ET
 
-fileName = os.path.join (sys.argv[1],'addon.xml')
-xmldoc = ET.parse( fileName )
+fileName = os.path.join(sys.argv[1], "addon.xml")
+xmldoc = ET.parse(fileName)
 root = xmldoc.getroot()
 
 # bump version
-version = root.get('version')
-parts = version.split('.')
+version = root.get("version")
+parts = version.split(".")
 parts[-1] = str(int(parts[-1]) + 1)
-print 'Addon version bumped to %s' % '.'.join(parts)
-root.set('version','.'.join(parts))
-for node in root.findall('requires/import'):
-    dependency = os.path.join (node.get('addon'),'addon.xml')
+print("Addon version bumped to {'.'.join(parts)}")
+root.set("version", ".".join(parts))
+for node in root.findall("requires/import"):
+    dependency = os.path.join(node.get("addon"), "addon.xml")
     if os.path.exists(dependency):
-        ver = ET.parse(dependency).getroot().get('version')
-        if ver != node.get('version'):
-            node.set('version',ver)
-            print 'Dependency %s to %s' % (node.get('addon'),ver) 
-xmldoc.write(fileName,xml_declaration=True,encoding='utf-8')
+        ver = ET.parse(dependency).getroot().get("version")
+        if ver != node.get("version"):
+            node.set("version", ver)
+            print("Dependency {node.get('addon')} to {ver}")
+xmldoc.write(fileName, xml_declaration=True, encoding="utf-8")

tools/get_addon_attribute

@@ -5,6 +5,5 @@ import xml.dom.minidom
 
 (fileName, attrName) = sys.argv[1:]
 
-xmldoc = xml.dom.minidom.parse( fileName )
-print xmldoc.childNodes[0].getAttribute( attrName )
-
+xmldoc = xml.dom.minidom.parse(fileName)
+print(xmldoc.childNodes[0].getAttribute(attrName))