From a2c9093ee40efb6ad614324c889423d43cb5bc8e Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Mon, 11 May 2015 18:16:19 -1000
Subject: [PATCH] Fix calls to os.path.expanduser with unicode strings.

expanduser does not handle unicode strings correctly, tries to decode using ASCII instead of FS encoding. Only workaround is to pass bytestrings
---
 src/mcedit2/editorapp.py | 2 +-
 src/mcedit2/main.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mcedit2/editorapp.py b/src/mcedit2/editorapp.py
index 23dd8f2..c570cfb 100644
--- a/src/mcedit2/editorapp.py
+++ b/src/mcedit2/editorapp.py
@@ -715,7 +715,7 @@ class MCEditApp(QtGui.QApplication):
         NotImplementedYet()
 
     def chooseOpenWorld(self):
-        startingDir = Settings().value("open_world_dialog/starting_dir", os.path.expanduser("~"))
+        startingDir = Settings().value("open_world_dialog/starting_dir", os.path.expanduser(b"~"))
         result = QtGui.QFileDialog.getOpenFileName(self.mainWindow, self.tr("Open World, Level or Schematic"),
                                                    startingDir,
                                                    "All files (*.*)")
diff --git a/src/mcedit2/main.py b/src/mcedit2/main.py
index e6b34e2..0d0a47c 100644
--- a/src/mcedit2/main.py
+++ b/src/mcedit2/main.py
@@ -61,7 +61,7 @@ def setup_logging():
 
         if sys.platform == "darwin":
             log_debug("OS X found.")
-            logfile = os.path.expanduser("~/Library/Logs/" + logfilename)
+            logfile = os.path.expanduser(b"~/Library/Logs/" + logfilename)
         else:
             logfile = abslogfile
     else: