equal
deleted
inserted
replaced
24 |
24 |
25 from __future__ import absolute_import |
25 from __future__ import absolute_import |
26 import sys |
26 import sys |
27 from types import TupleType |
27 from types import TupleType |
28 import base64 |
28 import base64 |
|
29 from builtins import str as text |
29 |
30 |
30 import wx |
31 import wx |
31 import wx.grid |
32 import wx.grid |
32 import wx.aui |
33 import wx.aui |
33 from six.moves import cPickle, xrange |
34 from six.moves import cPickle, xrange |
106 |
107 |
107 |
108 |
108 def DecodeFileSystemPath(path, is_base64=True): |
109 def DecodeFileSystemPath(path, is_base64=True): |
109 if is_base64: |
110 if is_base64: |
110 path = base64.decodestring(path) |
111 path = base64.decodestring(path) |
111 return unicode(path, sys.getfilesystemencoding()) |
112 return text(path, sys.getfilesystemencoding()) |
112 |
113 |
113 |
114 |
114 def AppendMenu(parent, help, id, kind, text): |
115 def AppendMenu(parent, help, id, kind, text): |
115 parent.Append(help=help, id=id, kind=kind, text=text) |
116 parent.Append(help=help, id=id, kind=kind, text=text) |
116 |
117 |