Revert and reuse

Author: g1itch

src/helper_startup.py

@@ -58,8 +58,6 @@ def loadConfig():
             if not needToCreateKeysFile:
                 logger.info(
                     'Loading existing config files from %s', state.appdata)
-        if sys.platform.startswith('win'):
-            state.appdata = state.appdata.decode(sys.getfilesystemencoding())
 
     if needToCreateKeysFile:
 

src/paths.py

@@ -23,12 +23,13 @@ def lookupExeFolder():
             # targetdir/Bitmessage.app/Contents/MacOS/Bitmessage
             os.path.dirname(sys.executable).split(os.path.sep)[0] + os.path.sep
             if frozen == "macosx_app" else
-            os.path.dirname(sys.executable) + os.path.sep)
+            os.path.dirname(sys.executable).decode(
+                sys.getfilesystemencoding(), 'ignore') + os.path.sep)
     elif __file__:
         exeFolder = os.path.dirname(__file__) + os.path.sep
     else:
         exeFolder = ''
-    return unicode(exeFolder)
+    return exeFolder
 
 
 def lookupAppdataFolder():
@@ -49,11 +50,10 @@ def lookupAppdataFolder():
             sys.exit(
                 'Could not find home folder, please report this message'
                 ' and your OS X version to the BitMessage Github.')
-    elif 'win32' in sys.platform or 'win64' in sys.platform:
+    elif sys.platform.startswith('win'):
         dataFolder = os.path.join(
-            os.environ['APPDATA'].decode(
-                sys.getfilesystemencoding(), 'ignore'), APPNAME
-        ) + os.path.sep
+            os.environ['APPDATA'], APPNAME
+        ).decode(sys.getfilesystemencoding(), 'ignore') + os.path.sep
     else:
         try:
             dataFolder = os.path.join(os.environ['XDG_CONFIG_HOME'], APPNAME)
@@ -69,7 +69,7 @@ def lookupAppdataFolder():
             # Old directory may not exist.
             pass
         dataFolder = dataFolder + os.path.sep
-    return unicode(dataFolder)
+    return dataFolder
 
 
 def codePath():