Merge branch 'kliment:master' into PythonSupport3.12_3.13

printrun/pronterface.py

@@ -34,7 +34,7 @@
 from printrun.spoolmanager import spoolmanager_gui
 
 from .utils import install_locale, setup_logging, dosify, \
-    iconfile, configfile, format_time, format_duration, \
+    iconfile, format_time, format_duration, \
     hexcolor_to_float, parse_temperature_report, \
     prepare_command, check_rgb_color, check_rgba_color, compile_file, \
     write_history_to, read_history_from
@@ -199,27 +199,6 @@ def __init__(self, app, filename = None, size = winsize):
         self.p.z_feedrate = self.settings.z_feedrate
 
         self.panel.SetBackgroundColour(self.bgcolor)
-        customdict = {}
-        try:
-            exec(compile_file(configfile("custombtn.txt")), customdict)
-            if len(customdict["btns"]):
-                if not len(self.custombuttons):
-                    try:
-                        self.custombuttons = customdict["btns"]
-                        for n in range(len(self.custombuttons)):
-                            self.cbutton_save(n, self.custombuttons[n])
-                        os.rename("custombtn.txt", "custombtn.old")
-                        rco = open("custombtn.txt", "w")
-                        rco.write(_("# I moved all your custom buttons into .pronsolerc.\n# Please don't add them here any more.\n# Backup of your old buttons is in custombtn.old\n"))
-                        rco.close()
-                    except IOError as x:
-                        logging.error(str(x))
-                else:
-                    logging.warning(_("Note!!! You have specified custom buttons in both custombtn.txt and .pronsolerc"))
-                    logging.warning(_("Ignoring custombtn.txt. Remove all current buttons to revert to custombtn.txt"))
-
-        except:
-            pass
         self.menustrip = wx.MenuBar()
         self.reload_ui()
         # disable all printer controls until we connect to a printer

printrun/utils.py

@@ -181,14 +181,6 @@ def sharedfile(filename):
     shared_pronterface_dir = os.path.join(DATADIR, 'pronterface')
     return lookup_file(filename, [shared_pronterface_dir])
 
-def configfile(filename):
-    '''
-    Get the full path to filename by checking in the
-    standard configuration directory (See the lookup_file
-    function's documentation for behavior).
-    '''
-    return lookup_file(filename, [os.path.expanduser("~/.printrun/"), ])
-
 def decode_utf8(s):
     """Attempt to decode a string, return the string otherwise"""
     if isinstance(s, bytes):