Remove appdirs

appdirs/appdirs.py

@@ -1,346 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2005-2010 ActiveState Software Inc.
-
-"""Utilities for determining application-specific dirs.
-
-See <http://github.com/ActiveState/appdirs> for details and usage.
-"""
-# Dev Notes:
-# - MSDN on where to store app data files:
-#   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
-# - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-__version_info__ = (1, 2, 0)
-__version__ = '.'.join(map(str, __version_info__))
-
-
-import sys
-import os
-
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    unicode = str
-
-class AppDirsError(Exception):
-    pass
-
-
-
-def user_data_dir(appname, appauthor=None, version=None, roaming=False):
-    r"""Return full path to the user-specific data dir for this application.
-
-        "appname" is the name of application.
-        "appauthor" (only required and used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-        "roaming" (boolean, default False) can be set True to use the Windows
-            roaming appdata directory. That means that for users on a Windows
-            network setup for roaming profiles, this user data will be
-            sync'd on login. See
-            <http://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>
-            for a discussion of issues.
-
-    Typical user data directories are:
-        Mac OS X:               ~/Library/Application Support/<AppName>
-        Unix:                   ~/.config/<appname>    # or in $XDG_CONFIG_HOME if defined
-        Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
-        Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
-        Win 7  (not roaming):   C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>
-        Win 7  (roaming):       C:\Users\<username>\AppData\Roaming\<AppAuthor>\<AppName>
-
-    For Unix, we follow the XDG spec and support $XDG_CONFIG_HOME. We don't
-    use $XDG_DATA_HOME as that data dir is mostly used at the time of
-    installation, instead of the application adding data during runtime.
-    Also, in practice, Linux apps tend to store their data in
-    "~/.config/<appname>" instead of "~/.local/share/<appname>".
-    """
-    if sys.platform.startswith("win"):
-        if appauthor is None:
-            raise AppDirsError("must specify 'appauthor' on Windows")
-        const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
-        path = os.path.join(_get_win_folder(const), appauthor, appname)
-    elif sys.platform == 'darwin':
-        path = os.path.join(
-            os.path.expanduser('~/Library/Application Support/'),
-            appname)
-    else:
-        path = os.path.join(
-            os.getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config")),
-            appname.lower())
-    if version:
-        path = os.path.join(path, version)
-    return path
-
-
-def site_data_dir(appname, appauthor=None, version=None):
-    """Return full path to the user-shared data dir for this application.
-
-        "appname" is the name of application.
-        "appauthor" (only required and used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-
-    Typical user data directories are:
-        Mac OS X:   /Library/Application Support/<AppName>
-        Unix:       /etc/xdg/<appname>
-        Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
-        Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
-        Win 7:      C:\ProgramData\<AppAuthor>\<AppName>   # Hidden, but writeable on Win 7.
-
-    For Unix, this is using the $XDG_CONFIG_DIRS[0] default.
-
-    WARNING: Do not use this on Windows. See the Vista-Fail note above for why.
-    """
-    if sys.platform.startswith("win"):
-        if appauthor is None:
-            raise AppDirsError("must specify 'appauthor' on Windows")
-        path = os.path.join(_get_win_folder("CSIDL_COMMON_APPDATA"),
-                            appauthor, appname)
-    elif sys.platform == 'darwin':
-        path = os.path.join(
-            os.path.expanduser('/Library/Application Support'),
-            appname)
-    else:
-        # XDG default for $XDG_CONFIG_DIRS[0]. Perhaps should actually
-        # *use* that envvar, if defined.
-        path = "/etc/xdg/"+appname.lower()
-    if version:
-        path = os.path.join(path, version)
-    return path
-
-
-def user_cache_dir(appname, appauthor=None, version=None, opinion=True):
-    r"""Return full path to the user-specific cache dir for this application.
-
-        "appname" is the name of application.
-        "appauthor" (only required and used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-        "opinion" (boolean) can be False to disable the appending of
-            "Cache" to the base app data dir for Windows. See
-            discussion below.
-
-    Typical user cache directories are:
-        Mac OS X:   ~/Library/Caches/<AppName>
-        Unix:       ~/.cache/<appname> (XDG default)
-        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
-        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
-
-    On Windows the only suggestion in the MSDN docs is that local settings go in
-    the `CSIDL_LOCAL_APPDATA` directory. This is identical to the non-roaming
-    app data dir (the default returned by `user_data_dir` above). Apps typically
-    put cache data somewhere *under* the given dir here. Some examples:
-        ...\Mozilla\Firefox\Profiles\<ProfileName>\Cache
-        ...\Acme\SuperApp\Cache\1.0
-    OPINION: This function appends "Cache" to the `CSIDL_LOCAL_APPDATA` value.
-    This can be disabled with the `opinion=False` option.
-    """
-    if sys.platform.startswith("win"):
-        if appauthor is None:
-            raise AppDirsError("must specify 'appauthor' on Windows")
-        path = os.path.join(_get_win_folder("CSIDL_LOCAL_APPDATA"),
-                            appauthor, appname)
-        if opinion:
-            path = os.path.join(path, "Cache")
-    elif sys.platform == 'darwin':
-        path = os.path.join(
-            os.path.expanduser('~/Library/Caches'),
-            appname)
-    else:
-        path = os.path.join(
-            os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache')),
-            appname.lower())
-    if version:
-        path = os.path.join(path, version)
-    return path
-
-def user_log_dir(appname, appauthor=None, version=None, opinion=True):
-    r"""Return full path to the user-specific log dir for this application.
-
-        "appname" is the name of application.
-        "appauthor" (only required and used on Windows) is the name of the
-            appauthor or distributing body for this application. Typically
-            it is the owning company name.
-        "version" is an optional version path element to append to the
-            path. You might want to use this if you want multiple versions
-            of your app to be able to run independently. If used, this
-            would typically be "<major>.<minor>".
-        "opinion" (boolean) can be False to disable the appending of
-            "Logs" to the base app data dir for Windows, and "log" to the
-            base cache dir for Unix. See discussion below.
-
-    Typical user cache directories are:
-        Mac OS X:   ~/Library/Logs/<AppName>
-        Unix:       ~/.cache/<appname>/log  # or under $XDG_CACHE_HOME if defined
-        Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
-        Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs
-
-    On Windows the only suggestion in the MSDN docs is that local settings
-    go in the `CSIDL_LOCAL_APPDATA` directory. (Note: I'm interested in
-    examples of what some windows apps use for a logs dir.)
-
-    OPINION: This function appends "Logs" to the `CSIDL_LOCAL_APPDATA`
-    value for Windows and appends "log" to the user cache dir for Unix.
-    This can be disabled with the `opinion=False` option.
-    """
-    if sys.platform == "darwin":
-        path = os.path.join(
-            os.path.expanduser('~/Library/Logs'),
-            appname)
-    elif sys.platform == "win32":
-        path = user_data_dir(appname, appauthor, version); version=False
-        if opinion:
-            path = os.path.join(path, "Logs")
-    else:
-        path = user_cache_dir(appname, appauthor, version); version=False
-        if opinion:
-            path = os.path.join(path, "log")
-    if version:
-        path = os.path.join(path, version)
-    return path
-
-
-class AppDirs(object):
-    """Convenience wrapper for getting application dirs."""
-    def __init__(self, appname, appauthor, version=None, roaming=False):
-        self.appname = appname
-        self.appauthor = appauthor
-        self.version = version
-        self.roaming = roaming
-    @property
-    def user_data_dir(self):
-        return user_data_dir(self.appname, self.appauthor,
-            version=self.version, roaming=self.roaming)
-    @property
-    def site_data_dir(self):
-        return site_data_dir(self.appname, self.appauthor,
-            version=self.version)
-    @property
-    def user_cache_dir(self):
-        return user_cache_dir(self.appname, self.appauthor,
-            version=self.version)
-    @property
-    def user_log_dir(self):
-        return user_log_dir(self.appname, self.appauthor,
-            version=self.version)
-
-
-
-
-#---- internal support stuff
-
-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_*
-    names.
-    """
-    import _winreg
-
-    shell_folder_name = {
-        "CSIDL_APPDATA": "AppData",
-        "CSIDL_COMMON_APPDATA": "Common AppData",
-        "CSIDL_LOCAL_APPDATA": "Local AppData",
-    }[csidl_name]
-
-    key = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
-        r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
-    dir, type = _winreg.QueryValueEx(key, shell_folder_name)
-    return dir
-
-def _get_win_folder_with_pywin32(csidl_name):
-    from win32com.shell import shellcon, shell
-    dir = shell.SHGetFolderPath(0, getattr(shellcon, csidl_name), 0, 0)
-    # Try to make this a unicode path because SHGetFolderPath does
-    # not return unicode strings when there is unicode data in the
-    # path.
-    try:
-        dir = unicode(dir)
-
-        # Downgrade to short path name if have highbit chars. See
-        # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
-        has_high_char = False
-        for c in dir:
-            if ord(c) > 255:
-                has_high_char = True
-                break
-        if has_high_char:
-            try:
-                import win32api
-                dir = win32api.GetShortPathName(dir)
-            except ImportError:
-                pass
-    except UnicodeError:
-        pass
-    return dir
-
-def _get_win_folder_with_ctypes(csidl_name):
-    import ctypes
-
-    csidl_const = {
-        "CSIDL_APPDATA": 26,
-        "CSIDL_COMMON_APPDATA": 35,
-        "CSIDL_LOCAL_APPDATA": 28,
-    }[csidl_name]
-
-    buf = ctypes.create_unicode_buffer(1024)
-    ctypes.windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
-
-    # Downgrade to short path name if have highbit chars. See
-    # <http://bugs.activestate.com/show_bug.cgi?id=85099>.
-    has_high_char = False
-    for c in buf:
-        if ord(c) > 255:
-            has_high_char = True
-            break
-    if has_high_char:
-        buf2 = ctypes.create_unicode_buffer(1024)
-        if ctypes.windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
-            buf = buf2
-
-    return buf.value
-
-if sys.platform == "win32":
-    try:
-        import win32com.shell
-        _get_win_folder = _get_win_folder_with_pywin32
-    except ImportError:
-        try:
-            import ctypes
-            _get_win_folder = _get_win_folder_with_ctypes
-        except ImportError:
-            _get_win_folder = _get_win_folder_from_registry
-
-
-
-#---- self test code
-
-if __name__ == "__main__":
-    appname = "MyApp"
-    appauthor = "MyCompany"
-
-    props = ("user_data_dir", "site_data_dir", "user_cache_dir",
-        "user_log_dir")
-
-    print("-- app dirs (without optional 'version')")
-    dirs = AppDirs(appname, appauthor, version="1.0")
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))
-
-    print("\n-- app dirs (with optional 'version')")
-    dirs = AppDirs(appname, appauthor)
-    for prop in props:
-        print("%s: %s" % (prop, getattr(dirs, prop)))

gam.py

@@ -156,17 +156,6 @@ def setGamDirs():
   global gamPath, gamSiteConfigDir, gamUserConfigDir, gamDriveDir, gamCacheDir
 
   gamPath = os.path.dirname(os.path.realpath(sys.argv[0]))
-  try:
-    useAppdirs = os.environ[u'USEAPPDIRS']
-  except:
-    useAppdirs = True
-  if useAppdirs:
-    from appdirs.appdirs import AppDirs
-    dirs = AppDirs(u'GAM', u'GAM')
-    gamSiteConfigDir = dirs.site_data_dir
-    gamUserConfigDir = dirs.user_data_dir
-    gamCacheDir = dirs.user_cache_dir
-  else:
   try:
     gamSiteConfigDir = os.environ[u'GAMSITECONFIGDIR']
   except KeyError:
@@ -187,12 +176,6 @@ def setGamDirs():
   if os.path.isfile(os.path.join(gamUserConfigDir, u'nocache.txt')):
     gamCacheDir = None
 
-def getGamSiteConfigFile(filename):
-  return os.path.join(gamSiteConfigDir, filename)
-
-def getGamUserConfigFile(filename):
-  return os.path.join(gamUserConfigDir, filename)
-
 def doGAMVersion():
   import struct
   print u'GAM %s - http://git.io/gam\n%s\nPython %s.%s.%s %s-bit %s\ngoogle-api-python-client %s\n%s %s\nPath: %s' % (__version__, __author__,
@@ -201,14 +184,14 @@ def doGAMVersion():
 
 def doGAMCheckForUpdates():
   import urllib2
-  if os.path.isfile(getGamUserConfigFile(u'noupdatecheck.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'noupdatecheck.txt')):
     return
   try:
     current_version = float(__version__)
   except ValueError:
     return
-  if os.path.isfile(getGamUserConfigFile(u'lastupdatecheck.txt')):
-    f = open(getGamUserConfigFile(u'lastupdatecheck.txt'), 'r')
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'lastupdatecheck.txt')):
+    f = open(os.path.join(gamUserConfigDir, u'lastupdatecheck.txt'), 'r')
     last_check_time = int(f.readline())
     f.close()
   else:
@@ -224,7 +207,7 @@ def doGAMCheckForUpdates():
     except ValueError:
       return
     if latest_version <= current_version:
-      f = open(getGamUserConfigFile(u'lastupdatecheck.txt'), 'w')
+      f = open(os.path.join(gamUserConfigDir, u'lastupdatecheck.txt'), 'w')
       f.write(str(now_time))
       f.close()
       return
@@ -239,7 +222,7 @@ def doGAMCheckForUpdates():
       webbrowser.open(u'https://github.com/jay0lee/GAM/releases')
       print u'GAM is now exiting so that you can overwrite this old version with the latest release'
       sys.exit(0)
-    f = open(getGamUserConfigFile(u'lastupdatecheck.txt'), 'w')
+    f = open(os.path.join(gamUserConfigDir, u'lastupdatecheck.txt'), 'w')
     f.write(str(now_time))
     f.close()
   except urllib2.HTTPError:
@@ -253,7 +236,7 @@ def commonAppsObjInit(appsObj):
                    sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3],
                    platform.platform(), platform.machine())
   #Show debugging output if debug.gam exists
-  if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
     appsObj.debug = True
   return appsObj
 
@@ -360,9 +343,9 @@ def tryOAuth(gdataObject):
   global domain
   global customerId
   try:
-    oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+    oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
   except KeyError:
-    oauth2file = getGamUserConfigFile(u'oauth2.txt')
+    oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
   storage = oauth2client.file.Storage(oauth2file)
   credentials = storage.get()
   if credentials is None or credentials.invalid:
@@ -370,9 +353,10 @@ def tryOAuth(gdataObject):
     credentials = storage.get()
   if credentials.access_token_expired:
     disable_ssl_certificate_validation = False
-    if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
       disable_ssl_certificate_validation = True
-    credentials.refresh(httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'), disable_ssl_certificate_validation=disable_ssl_certificate_validation))
+    credentials.refresh(httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
+                                      disable_ssl_certificate_validation=disable_ssl_certificate_validation))
   gdataObject.additional_headers = {u'Authorization': u'Bearer %s' % credentials.access_token}
   try:
     domain = os.environ[u'GA_DOMAIN'].lower()
@@ -427,9 +411,9 @@ def callGAPI(service, function, silent_errors=False, soft_errors=False, throw_re
       except ValueError:
         if n < 3:
           disable_ssl_certificate_validation = False
-          if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+          if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
             disable_ssl_certificate_validation = True
-          service._http.request.credentials.refresh(httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'),
+          service._http.request.credentials.refresh(httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
                                                                   disable_ssl_certificate_validation=disable_ssl_certificate_validation))
           continue
         if (e.resp[u'status'] == u'503') and (e.content == u'Quota exceeded for the current request'):
@@ -573,9 +557,9 @@ def getAPIScope(api):
 def buildGAPIObject(api):
   global domain, customerId
   try:
-    oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+    oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
   except KeyError:
-    oauth2file = getGamUserConfigFile(u'oauth2.txt')
+    oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
   storage = oauth2client.file.Storage(oauth2file)
   credentials = storage.get()
   if credentials is None or credentials.invalid:
@@ -585,17 +569,18 @@ def buildGAPIObject(api):
                    sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3],
                    platform.platform(), platform.machine())
   disable_ssl_certificate_validation = False
-  if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
     disable_ssl_certificate_validation = True
-  http = httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'), disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
-  if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+  http = httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
+                       disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
     httplib2.debuglevel = 4
     extra_args[u'prettyPrint'] = True
-  if os.path.isfile(getGamUserConfigFile(u'extra-args.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'extra-args.txt')):
     import ConfigParser
     config = ConfigParser.ConfigParser()
     config.optionxform = str
-    config.read(getGamUserConfigFile(u'extra-args.txt'))
+    config.read(os.path.join(gamUserConfigDir, u'extra-args.txt'))
     extra_args.update(dict(config.items(u'extra-args')))
   http = credentials.authorize(http)
   version = getAPIVer(api)
@@ -604,7 +589,7 @@ def buildGAPIObject(api):
   try:
     service = googleapiclient.discovery.build(api, version, http=http)
   except googleapiclient.errors.UnknownApiNameOrVersion:
-    disc_file = getGamSiteConfigFile(u'%s-%s.json' % (api, version))
+    disc_file = os.path.join(gamSiteConfigDir, u'%s-%s.json' % (api, version))
     if os.path.isfile(disc_file):
       f = file(disc_file, 'rb')
       discovery = f.read()
@@ -631,9 +616,9 @@ def buildGAPIObject(api):
 
 def buildGAPIServiceObject(api, act_as=None, soft_errors=False):
   try:
-    oauth2servicefile = getGamUserConfigFile(os.environ[u'OAUTHSERVICEFILE'])
+    oauth2servicefile = os.path.join(gamUserConfigDir, os.environ[u'OAUTHSERVICEFILE'])
   except KeyError:
-    oauth2servicefile = getGamUserConfigFile(u'oauth2service')
+    oauth2servicefile = os.path.join(gamUserConfigDir, u'oauth2service')
   oauth2servicefilejson = u'%s.json' % oauth2servicefile
   oauth2servicefilep12 = u'%s.p12' % oauth2servicefile
   try:
@@ -664,17 +649,18 @@ def buildGAPIServiceObject(api, act_as=None, soft_errors=False):
                    sys.version_info[0], sys.version_info[1], sys.version_info[2], sys.version_info[3],
                    platform.platform(), platform.machine())
   disable_ssl_certificate_validation = False
-  if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
     disable_ssl_certificate_validation = True
-  http = httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'), disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
-  if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+  http = httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
+                       disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
     httplib2.debuglevel = 4
     extra_args[u'prettyPrint'] = True
-  if os.path.isfile(getGamUserConfigFile(u'extra-args.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'extra-args.txt')):
     import ConfigParser
     config = ConfigParser.ConfigParser()
     config.optionxform = str
-    config.read(getGamUserConfigFile(u'extra-args.txt'))
+    config.read(os.path.join(gamUserConfigDir, u'extra-args.txt'))
     extra_args.update(dict(config.items(u'extra-args')))
   http = credentials.authorize(http)
   version = getAPIVer(api)
@@ -697,9 +683,10 @@ def buildDiscoveryObject(api):
     api = u'admin'
   params = {'api': api, 'apiVersion': version}
   disable_ssl_certificate_validation = False
-  if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
     disable_ssl_certificate_validation = True
-  http = httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'), disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
+  http = httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
+                       disable_ssl_certificate_validation=disable_ssl_certificate_validation, cache=gamCacheDir)
   requested_url = uritemplate.expand(googleapiclient.discovery.DISCOVERY_URI, params)
   resp, content = http.request(requested_url)
   if resp.status == 404:
@@ -5609,9 +5596,9 @@ def doGetUserInfo(user_email=None):
       user_email = sys.argv[3]
     except IndexError:
       try:
-        oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+        oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
       except KeyError:
-        oauth2file = getGamUserConfigFile(u'oauth2.txt')
+        oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
       storage = oauth2client.file.Storage(oauth2file)
       credentials = storage.get()
       if credentials is None or credentials.invalid:
@@ -6682,7 +6669,7 @@ def output_csv(csv_list, titles, list_type, todrive):
     media = googleapiclient.http.MediaInMemoryUpload(string_data, mimetype=u'text/csv')
     result = callGAPI(service=drive.files(), function=u'insert', convert=convert, body={u'description': u' '.join(sys.argv), u'title': u'%s - %s' % (domain, list_type), u'mimeType': u'text/csv'}, media_body=media)
     file_url = result[u'alternateLink']
-    if os.path.isfile(getGamUserConfigFile(u'nobrowser.txt')):
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'nobrowser.txt')):
       msg_txt = u'Drive file uploaded to:\n %s' % file_url
       msg_subj = u'%s - %s' % (domain, list_type)
       send_email(msg_subj, msg_txt)
@@ -8043,9 +8030,9 @@ def OAuthInfo():
     access_token = sys.argv[3]
   except IndexError:
     try:
-      oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+      oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
     except KeyError:
-      oauth2file = getGamUserConfigFile(u'oauth2.txt')
+      oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
     storage = oauth2client.file.Storage(oauth2file)
     credentials = storage.get()
     if credentials is None or credentials.invalid:
@@ -8055,10 +8042,11 @@ def OAuthInfo():
                                                                                                   sys.version_info[0], sys.version_info[1], sys.version_info[2],
                                                                                                   sys.version_info[3], platform.platform(), platform.machine())
     disable_ssl_certificate_validation = False
-    if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
       disable_ssl_certificate_validation = True
-    http = httplib2.Http(ca_certs=getGamSiteConfigFile(u'cacert.pem'), disable_ssl_certificate_validation=disable_ssl_certificate_validation)
-    if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+    http = httplib2.Http(ca_certs=os.path.join(gamSiteConfigDir, u'cacert.pem'),
+                         disable_ssl_certificate_validation=disable_ssl_certificate_validation)
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
       httplib2.debuglevel = 4
     if credentials.access_token_expired:
       credentials.refresh(http)
@@ -8081,9 +8069,9 @@ def OAuthInfo():
 
 def doDeleteOAuth():
   try:
-    oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+    oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
   except KeyError:
-    oauth2file = getGamUserConfigFile(u'oauth2.txt')
+    oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
   storage = oauth2client.file.Storage(oauth2file)
   credentials = storage.get()
   try:
@@ -8091,12 +8079,12 @@ def doDeleteOAuth():
   except AttributeError:
     print u'Error: Authorization doesn\'t exist'
     sys.exit(1)
-  certFile = getGamSiteConfigFile(u'cacert.pem')
+  certFile = os.path.join(gamSiteConfigDir, u'cacert.pem')
   disable_ssl_certificate_validation = False
-  if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
     disable_ssl_certificate_validation = True
   http = httplib2.Http(ca_certs=certFile, disable_ssl_certificate_validation=disable_ssl_certificate_validation)
-  if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
     httplib2.debuglevel = 4
   sys.stderr.write(u'This OAuth token will self-destruct in 3...')
   time.sleep(1)
@@ -8144,9 +8132,9 @@ possible_scopes = [u'https://www.googleapis.com/auth/admin.directory.group',
 
 def doRequestOAuth(incremental_auth=False):
   try:
-    CLIENT_SECRETS = getGamUserConfigFile(os.environ[u'CLIENTSECRETSFILE'])
+    CLIENT_SECRETS = os.path.join(gamUserConfigDir, os.environ[u'CLIENTSECRETSFILE'])
   except KeyError:
-    CLIENT_SECRETS = getGamUserConfigFile(u'client_secrets.json')
+    CLIENT_SECRETS = os.path.join(gamUserConfigDir, u'client_secrets.json')
   MISSING_CLIENT_SECRETS_MESSAGE = u"""
 WARNING: Please configure OAuth 2.0
 
@@ -8268,21 +8256,21 @@ access or an 'a' to grant action-only access.
                                                      scope=scopes,
                                                      message=MISSING_CLIENT_SECRETS_MESSAGE)
   try:
-    oauth2file = getGamUserConfigFile(os.environ[u'OAUTHFILE'])
+    oauth2file = os.path.join(gamUserConfigDir, os.environ[u'OAUTHFILE'])
   except KeyError:
-    oauth2file = getGamUserConfigFile(u'oauth2.txt')
+    oauth2file = os.path.join(gamUserConfigDir, u'oauth2.txt')
   storage = oauth2client.file.Storage(oauth2file)
   credentials = storage.get()
   flags = cmd_flags()
-  if os.path.isfile(getGamUserConfigFile(u'nobrowser.txt')):
+  if os.path.isfile(os.path.join(gamUserConfigDir, u'nobrowser.txt')):
     flags.noauth_local_webserver = True
   if credentials is None or credentials.invalid or incremental_auth:
-    certFile = getGamSiteConfigFile(u'cacert.pem')
+    certFile = os.path.join(gamSiteConfigDir, u'cacert.pem')
     disable_ssl_certificate_validation = False
-    if os.path.isfile(getGamUserConfigFile(u'noverifyssl.txt')):
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'noverifyssl.txt')):
       disable_ssl_certificate_validation = True
     http = httplib2.Http(ca_certs=certFile, disable_ssl_certificate_validation=disable_ssl_certificate_validation)
-    if os.path.isfile(getGamUserConfigFile(u'debug.gam')):
+    if os.path.isfile(os.path.join(gamUserConfigDir, u'debug.gam')):
       httplib2.debuglevel = 4
       extra_args[u'prettyPrint'] = True
     try: