Skip to content

Treat empty environment variables like unset ones #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Treat empty environment variables like unset ones #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57c8910
Treat empty environment variables like unset ones
clbarnes Feb 19, 2020
3a40b2b
Empty environment variable: review comments
clbarnes Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions appdirs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down