Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 03:50:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issue when sys.prefix is not unicode (Python2) and when its contents are not translatable to utf-8.

Browse Source
This commit is contained in:
Robin Dunn
2018-06-25 09:39:57 -07:00
parent a55c2fc685
commit 3e88095c53
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@@ -37,6 +37,9 @@ Changes in this release include the following:
passing it to a window constructor, and can also be used as the source in a passing it to a window constructor, and can also be used as the source in a
Bind(). Bind().
* Fixed issue when sys.prefix is not unicode (Python2) and when its contents
are not translatable to utf-8.
4.0.2 "Cute as a June bug!" 4.0.2 "Cute as a June bug!"

5
etg/app.py
View File

@@ -430,7 +430,10 @@ def run():
self.RedirectStdio(filename) self.RedirectStdio(filename)
# Use Python's install prefix as the default # Use Python's install prefix as the default
wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) prefix = _sys.prefix
if isinstance(prefix, (bytes, bytearray)):
prefix = prefix.decode(_sys.getfilesystemencoding())
wx.StandardPaths.Get().SetInstallPrefix(prefix)
# Until the new native control for wxMac is up to par, still use the generic one. # Until the new native control for wxMac is up to par, still use the generic one.
wx.SystemOptions.SetOption("mac.listctrl.always_use_generic", 1) wx.SystemOptions.SetOption("mac.listctrl.always_use_generic", 1)