diff --git a/appdirs.py b/appdirs.py index 975e9bf..c1a9ba1 100644 --- a/appdirs.py +++ b/appdirs.py @@ -41,6 +41,9 @@ system = sys.platform +def getenv(name, default=None): + return os.getenv(name) or default + def user_data_dir(appname=None, appauthor=None, version=None, roaming=False): r"""Return full path to the user-specific data dir for this application. @@ -89,7 +92,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False): if appname: path = os.path.join(path, appname) else: - path = os.getenv('XDG_DATA_HOME', os.path.expanduser("~/.local/share")) + path = getenv('XDG_DATA_HOME', os.path.expanduser("~/.local/share")) if appname: path = os.path.join(path, appname) if appname and version: @@ -144,8 +147,9 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False): else: # XDG default for $XDG_DATA_DIRS # only first, if multipath is False - path = os.getenv('XDG_DATA_DIRS', - os.pathsep.join(['/usr/local/share', '/usr/share'])) + path = getenv( + 'XDG_DATA_DIRS', os.pathsep.join(['/usr/local/share', '/usr/share']) + ) pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)] if appname: if version: @@ -199,7 +203,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False): if appname: path = os.path.join(path, appname) else: - path = os.getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config")) + path = getenv('XDG_CONFIG_HOME', os.path.expanduser("~/.config")) if appname: path = os.path.join(path, appname) if appname and version: @@ -248,7 +252,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False) else: # XDG default for $XDG_CONFIG_DIRS # only first, if multipath is False - path = os.getenv('XDG_CONFIG_DIRS', '/etc/xdg') + path = getenv('XDG_CONFIG_DIRS', '/etc/xdg') pathlist = [os.path.expanduser(x.rstrip(os.sep)) for x in path.split(os.pathsep)] if appname: if version: @@ -311,7 +315,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True): if appname: path = os.path.join(path, appname) else: - path = os.getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache')) + path = getenv('XDG_CACHE_HOME', os.path.expanduser('~/.cache')) if appname: path = os.path.join(path, appname) if appname and version: @@ -353,7 +357,7 @@ def user_state_dir(appname=None, appauthor=None, version=None, roaming=False): if system in ["win32", "darwin"]: path = user_data_dir(appname, appauthor, None, roaming) else: - path = os.getenv('XDG_STATE_HOME', os.path.expanduser("~/.local/state")) + path = getenv('XDG_STATE_HOME', os.path.expanduser("~/.local/state")) if appname: path = os.path.join(path, appname) if appname and version: