mac: hardcode user directories (r=trentm)

1 files changed, 9 insertions, 34 deletions

diff --git a/lib/appdirs.py b/lib/appdirs.py
index 3fcf698..2fff84c 100644
--- a/lib/appdirs.py
+++ b/lib/appdirs.py
@@ -60,8 +60,9 @@ def user_data_dir(appname, appauthor=None, version=None, roaming=False):
         const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
         path = os.path.join(_get_win_folder(const), appauthor, appname)
     elif sys.platform == 'darwin':
-        basepath = _get_mac_folder('application support')
-        path = os.path.join(basepath, appname)
+        path = os.path.join(
+            os.path.expanduser('~/Library/Application Support/'),
+            appname)
     else:
         path = os.path.expanduser("~/." + appname.lower())
     if version:
@@ -96,8 +97,9 @@ def site_data_dir(appname, appauthor=None, version=None):
         path = os.path.join(_get_win_folder("CSIDL_COMMON_APPDATA"),
                             appauthor, appname)
     elif sys.platform == 'darwin':
-        basepath = _get_mac_folder('application support')
-        path = os.path.join(basepath, appname)
+        path = os.path.join(
+            os.path.expanduser('~/Library/Application Support'),
+            appname)
     else:
         path = "/etc/"+appname.lower()
     if version:
@@ -146,8 +148,9 @@ def user_cache_dir(appname, appauthor=None, version=None, opinion=True):
         if opinion:
             path = os.path.join(path, "Cache")
     elif sys.platform == 'darwin':
-        basepath = _get_mac_folder('caches')
-        path = os.path.join(basepath, appname)
+        path = os.path.join(
+            os.path.expanduser('~/Library/Caches'),
+            appname)
     else:
         path = os.path.expanduser("~/.%s" % appname.lower())
         if opinion:
@@ -181,34 +184,6 @@ class AppDirs(object):
 
 #---- internal support stuff
 
-def _get_mac_folder_from_carbon(name):
-    """Get folder path from the `Carbon` module"""
-    from Carbon import Folder, Folders
-    
-    folder_constant = {
-        'application support': Folders.kApplicationSupportFolderType,
-        'caches':              Folders.kCachedDataFolderType
-    }[name]
-    
-    path = Folder.FSFindFolder(Folders.kUserDomain,
-                               folder_constant,
-                               Folders.kDontCreateFolder)
-    return path.FSRefMakePath()
-    
-def _get_mac_folder_hardcoded(name):
-    return {
-        'application support': os.path.expanduser('~/Library/Application Support'),
-        'caches': os.path.expanduser('~/Library/Caches'),
-    }[name]
-    
-if sys.platform == "darwin":
-    try:
-        import Carbon
-        _get_mac_folder = _get_mac_folder_from_carbon
-    except ImportError:
-        _get_mac_folder = _get_mac_folder_hardcoded
-    
-
 def _get_win_folder_from_registry(csidl_name):
     """This is a fallback technique at best. I'm not sure if using the
     registry for this guarantees us the correct answer for all CSIDL_*