Merge branch 'master' of https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X

extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py

@@ -36,13 +36,6 @@ class AboutUpgradeMightyScape(inkex.EffectExtension):
             remoteCommit = remote_repo.fetch()[0].commit
             self.msg("Latest remote commit is: " + str(remoteCommit)[:7])
 
-            # for every remote commit
-            while remoteCommit.hexsha != localCommit.hexsha:
-                try:
-                    remoteCommit = remoteCommit.parents[0]
-                except:
-                    pass
-
             if localCommit.hexsha != remoteCommit.hexsha:
                 ssh_executable = 'git'
                 with local_repo.git.custom_environment(GIT_SSH=ssh_executable):
@@ -58,7 +51,9 @@ class AboutUpgradeMightyScape(inkex.EffectExtension):
             else:
                 inkex.utils.debug("Nothing to do! MightyScape is already up to date!")  
                    
-        except git.exc.GitCommandError:
+        except git.exc.GitCommandError as e:
+            self.msg("Error: ")
+            self.msg(e)
             return False
         return True
 

extensions/fablabchemnitz/open_in_roland_cutstudio/open_in_roland_cutstudio.py

@@ -426,7 +426,7 @@ else:
     # normally
     destination = filename + ".cutstudio.eps"
 
-EPS2CutstudioEPS(inkscape_eps_file, destination, mirror=("--mirror=true" in sys.argv))
+OpenInRolandCutStudio(inkscape_eps_file, destination, mirror=("--mirror=true" in sys.argv))
 
 if "--selftest" in sys.argv:
     # unittest: compare with known reference output

extensions/fablabchemnitz/tab_generator/tab_generator.py

@@ -69,7 +69,7 @@ class pnPoint(object):
             j=i
         return inside
 
-class Tabgen(inkex.EffectExtension):
+class TabGenerator(inkex.EffectExtension):
     
     def add_arguments(self, pars):
         pars.add_argument("--usermenu")
@@ -665,4 +665,4 @@ class Tabgen(inkex.EffectExtension):
                 elem.delete()  
 
 if __name__ == '__main__':
-    Tabgen().run()
+    TabGenerator().run()