From e73e11d5547271ebace388f22a232df2d75b95e8 Mon Sep 17 00:00:00 2001
From: Kliment Yanev <kliment.yanev@gmail.com>
Date: Sun, 15 Jul 2012 14:55:11 +0200
Subject: [PATCH] Allow unicode characters in custom button command names

---
 pronsole.py    |  8 ++++----
 pronterface.py | 30 ++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pronsole.py b/pronsole.py
index 61f7ef8..2d2b557 100755
--- a/pronsole.py
+++ b/pronsole.py
@@ -18,7 +18,7 @@
 import cmd, printcore, sys 
 import glob, os, time
 import sys, subprocess 
-import math
+import math, codecs
 from math import sqrt
 import gettext
 if os.path.exists('/usr/share/pronterface/locale'):
@@ -492,7 +492,7 @@ class pronsole(cmd.Cmd):
     def load_rc(self,rc_filename):
         self.processing_rc=True
         try:
-            rc=open(rc_filename)
+            rc=codecs.open(rc_filename,"r","utf-8")
             self.rc_filename = os.path.abspath(rc_filename)
             for rc_cmd in rc:
                 if not rc_cmd.lstrip().startswith("#"):
@@ -534,8 +534,8 @@ class pronsole(cmd.Cmd):
             if os.path.exists(self.rc_filename):
                 import shutil
                 shutil.copy(self.rc_filename,self.rc_filename+"~bak")
-                rci=open(self.rc_filename+"~bak","r")
-            rco=open(self.rc_filename,"w")
+                rci=codecs.open(self.rc_filename+"~bak","r","utf-8")
+            rco=codecs.open(self.rc_filename,"w","utf-8")
             if rci is not None:
                 overwriting = False
                 for rc_cmd in rci:
diff --git a/pronterface.py b/pronterface.py
index 2336654..2ef102b 100755
--- a/pronterface.py
+++ b/pronterface.py
@@ -1940,16 +1940,26 @@ class ButtonEdit(wx.Dialog):
     def macrob_enabler(self,e):
         macro = self.command.GetValue()
         valid = False
-        if macro == "":
-            valid = True
-        elif self.pronterface.macros.has_key(macro):
-            valid = True
-        elif hasattr(self.pronterface.__class__,"do_"+macro):
-            valid = False
-        elif len([c for c in macro if not c.isalnum() and c != "_"]):
-            valid = False
-        else:
-            valid = True
+        try:
+            if macro == "":
+                valid = True
+            elif self.pronterface.macros.has_key(macro):
+                valid = True
+            elif hasattr(self.pronterface.__class__,u"do_"+macro):
+                valid = False
+            elif len([c for c in macro if not c.isalnum() and c != "_"]):
+                valid = False
+            else:
+                valid = True
+        except:
+            if macro == "":
+                valid = True
+            elif self.pronterface.macros.has_key(macro):
+                valid = True
+            elif len([c for c in macro if not c.isalnum() and c != "_"]):
+                valid = False
+            else:
+                valid = True
         self.macrob.Enable(valid)
     def macrob_handler(self,e):
         macro = self.command.GetValue()