Use xdg module instead of custom XDG logic

sebastinas · sebastinas · commit 8bc9df74ceb1 · 2020-12-31T13:19:49.000+01:00
diff --git a/README.rst b/README.rst
@@ -155,13 +155,14 @@ your config file as **~/.config/bpython/config** (i.e.
 Dependencies
 ============
 * Pygments
-* requests
 * curtsies >= 0.3.3
 * greenlet
+* requests
+* xdg
 * Sphinx >= 1.5 (optional, for the documentation)
 * babel (optional, for internationalization)
-* watchdog (optional, for monitoring imported modules for changes)
 * jedi (optional, for experimental multiline completion)
+* watchdog (optional, for monitoring imported modules for changes)
 
 bpython-urwid
 -------------
diff --git a/bpython/config.py b/bpython/config.py
@@ -3,6 +3,7 @@
 import locale
 from itertools import chain
 from configparser import ConfigParser
+from xdg import BaseDirectory
 
 from .autocomplete import AutocompleteModes
 
@@ -34,8 +35,7 @@ def supports_box_chars():
 
 def get_config_home():
     """Returns the base directory for bpython's configuration files."""
-    xdg_config_home = os.environ.get("XDG_CONFIG_HOME", "~/.config")
-    return os.path.join(xdg_config_home, "bpython")
+    return os.path.join(BaseDirectory.xdg_config_home, "bpython")
 
 
 def default_config_path():
diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ curtsies >=0.3.3
 greenlet
 requests
 setuptools
+xdg
diff --git a/setup.py b/setup.py
@@ -174,6 +174,7 @@ def git_describe_to_python_version(version):
     "curtsies >=0.3.3",
     "greenlet",
     "wcwidth",
+    "xdg",
 ]
 
 extras_require = {

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ def git_describe_to_python_version(version):`
`174`	`174`	`"curtsies >=0.3.3",`
`175`	`175`	`"greenlet",`
`176`	`176`	`"wcwidth",`
	`177`	`+ "xdg",`
`177`	`178`	`]`
`178`	`179`
`179`	`180`	`extras_require = {`