Merge pull request #7787 from xavfernandez/drop_user_data_dir

utils.appdirs: drop unused user_data_dir function

Author: xavfernandez

src/pip/_internal/utils/appdirs.py

@@ -28,11 +28,6 @@ def user_config_dir(appname, roaming=True):
     return _appdirs.user_config_dir(appname, appauthor=False, roaming=roaming)
 
 
-def user_data_dir(appname, roaming=False):
-    # type: (str, bool) -> str
-    return _appdirs.user_data_dir(appname, appauthor=False, roaming=roaming)
-
-
 # for the discussion regarding site_config_dir locations
 # see <https://github.com/pypa/pip/issues/1733>
 def site_config_dirs(appname):

tests/unit/test_appdirs.py

@@ -147,88 +147,6 @@ def test_site_config_dirs_linux_empty(self, monkeypatch):
         assert appdirs.site_config_dirs("pip") == ['/etc/xdg/pip', '/etc']
 
 
-class TestUserDataDir:
-
-    def test_user_data_dir_win_no_roaming(self, monkeypatch):
-        @pretend.call_recorder
-        def _get_win_folder(base):
-            return "C:\\Users\\test\\AppData\\Local"
-
-        monkeypatch.setattr(
-            _appdirs,
-            "_get_win_folder",
-            _get_win_folder,
-            raising=False,
-        )
-        monkeypatch.setattr(_appdirs, "system", "win32")
-        monkeypatch.setattr(os, "path", ntpath)
-
-        assert (appdirs.user_data_dir("pip") ==
-                "C:\\Users\\test\\AppData\\Local\\pip")
-        assert _get_win_folder.calls == [pretend.call("CSIDL_LOCAL_APPDATA")]
-
-    def test_user_data_dir_win_yes_roaming(self, monkeypatch):
-        @pretend.call_recorder
-        def _get_win_folder(base):
-            return "C:\\Users\\test\\AppData\\Roaming"
-
-        monkeypatch.setattr(
-            _appdirs,
-            "_get_win_folder",
-            _get_win_folder,
-            raising=False,
-        )
-        monkeypatch.setattr(_appdirs, "system", "win32")
-        monkeypatch.setattr(os, "path", ntpath)
-
-        assert (
-            appdirs.user_data_dir("pip", roaming=True) ==
-            "C:\\Users\\test\\AppData\\Roaming\\pip"
-        )
-        assert _get_win_folder.calls == [pretend.call("CSIDL_APPDATA")]
-
-    def test_user_data_dir_osx(self, monkeypatch):
-        monkeypatch.setattr(_appdirs, "system", "darwin")
-        monkeypatch.setattr(os, "path", posixpath)
-        monkeypatch.setenv("HOME", "/home/test")
-        monkeypatch.setattr(sys, "platform", "darwin")
-
-        if os.path.isdir('/home/test/Library/Application Support/'):
-            assert (appdirs.user_data_dir("pip") ==
-                    "/home/test/Library/Application Support/pip")
-        else:
-            assert (appdirs.user_data_dir("pip") ==
-                    "/home/test/.config/pip")
-
-    def test_user_data_dir_linux(self, monkeypatch):
-        monkeypatch.setattr(_appdirs, "system", "linux2")
-        monkeypatch.setattr(os, "path", posixpath)
-        monkeypatch.delenv("XDG_DATA_HOME", raising=False)
-        monkeypatch.setenv("HOME", "/home/test")
-        monkeypatch.setattr(sys, "platform", "linux2")
-
-        assert appdirs.user_data_dir("pip") == "/home/test/.local/share/pip"
-
-    def test_user_data_dir_linux_override(self, monkeypatch):
-        monkeypatch.setattr(_appdirs, "system", "linux2")
-        monkeypatch.setattr(os, "path", posixpath)
-        monkeypatch.setenv("XDG_DATA_HOME", "/home/test/.other-share")
-        monkeypatch.setenv("HOME", "/home/test")
-        monkeypatch.setattr(sys, "platform", "linux2")
-
-        assert appdirs.user_data_dir("pip") == "/home/test/.other-share/pip"
-
-    def test_user_data_dir_linux_home_slash(self, monkeypatch):
-        monkeypatch.setattr(_appdirs, "system", "linux2")
-        monkeypatch.setattr(os, "path", posixpath)
-        # Verify that we are not affected by https://bugs.python.org/issue14768
-        monkeypatch.delenv("XDG_DATA_HOME", raising=False)
-        monkeypatch.setenv("HOME", "/")
-        monkeypatch.setattr(sys, "platform", "linux2")
-
-        assert appdirs.user_data_dir("pip") == "/.local/share/pip"
-
-
 class TestUserConfigDir:
 
     def test_user_config_dir_win_no_roaming(self, monkeypatch):
@@ -276,10 +194,10 @@ def test_user_config_dir_osx(self, monkeypatch):
         monkeypatch.setattr(sys, "platform", "darwin")
 
         if os.path.isdir('/home/test/Library/Application Support/'):
-            assert (appdirs.user_data_dir("pip") ==
+            assert (appdirs.user_config_dir("pip") ==
                     "/home/test/Library/Application Support/pip")
         else:
-            assert (appdirs.user_data_dir("pip") ==
+            assert (appdirs.user_config_dir("pip") ==
                     "/home/test/.config/pip")
 
     def test_user_config_dir_linux(self, monkeypatch):