Remove unicode path fixes for now to better test original problems

config.py

@@ -58,6 +58,13 @@ def __createDirs(path):
         os.makedirs(path)
 
 
+def getPyfaRoot():
+    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
+    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
+    root = unicode(root, sys.getfilesystemencoding())
+    return root
+
+
 def defPaths(customSavePath):
     global debug
     global pyfaPath
@@ -75,32 +82,33 @@ def defPaths(customSavePath):
     # Python 2.X uses ANSI by default, so we need to convert the character encoding
     pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
     if pyfaPath is None:
-        pyfaPath = getPyfaPath()
+        pyfaPath = getPyfaRoot()
 
     # Where we store the saved fits etc, default is the current users home directory
     if saveInRoot is True:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = getPyfaPath("saveddata")
+            savePath = os.path.join(pyfaPath, "saveddata")
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
             if customSavePath is None:  # customSavePath is not overriden
-                savePath = os.path.expanduser(os.path.join("~", ".pyfa"))
+                savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+                                   sys.getfilesystemencoding())
             else:
                 savePath = customSavePath
 
     __createDirs(savePath)
 
     if isFrozen():
-        certName = "cacert.pem"
-        os.environ["REQUESTS_CA_BUNDLE"] = getPyfaPath(certName).encode('utf8')
-        os.environ["SSL_CERT_FILE"] = getPyfaPath(certName).encode('utf8')
+        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
 
-    loggingFormat = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
-    logging.basicConfig(format=loggingFormat, level=logLevel)
-    handler = logging.handlers.RotatingFileHandler(getSavePath("log.txt"), maxBytes=1000000, backupCount=3)
-    formatter = logging.Formatter(loggingFormat)
+    _format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    logging.basicConfig(format=_format, level=logLevel)
+    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000,
+                                                   backupCount=3)
+    formatter = logging.Formatter(_format)
     handler.setFormatter(formatter)
     logging.getLogger('').addHandler(handler)
 
@@ -117,14 +125,14 @@ def defPaths(customSavePath):
         # sys.stderr = sl
 
     # The database where we store all the fits etc
-    saveDB = getSavePath("saveddata.db")
+    saveDB = os.path.join(savePath, "saveddata.db")
 
     # The database where the static EVE data from the datadump is kept.
     # This is not the standard sqlite datadump but a modified version created by eos
     # maintenance script
-    gameDB = getPyfaPath("eve.db")
+    gameDB = os.path.join(pyfaPath, "eve.db")
 
-    # DON'T MODIFY ANYTHING BELOW!
+    ## DON'T MODIFY ANYTHING BELOW ##
     import eos.config
 
     # Caching modifiers, disable all gamedata caching, its unneeded.
@@ -133,7 +141,7 @@ def defPaths(customSavePath):
     eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
     eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
 
-
+'''
 def getPyfaPath(Append=None):
     base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
     root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
@@ -170,3 +178,4 @@ def parsePath(root, Append=None):
             path = path.decode('windows-1252')
 
     return path
+'''