Make SqliteAccountInfo.get_user_account_info_path private

Author: ppolewicz

b2sdk/account_info/sqlite_account_info.py

@@ -42,7 +42,7 @@ class SqliteAccountInfo(UrlPoolAccountInfo):
     completed.
     """
 
-    def __init__(self, file_name=None, last_upgrade_to_run=None, profile=None):
+    def __init__(self, file_name=None, last_upgrade_to_run=None, profile: Optional[str] = None):
         """
         Initialize SqliteAccountInfo.
 
@@ -70,7 +70,7 @@ def __init__(self, file_name=None, last_upgrade_to_run=None, profile=None):
         """
         self.thread_local = threading.local()
 
-        self.filename = self.get_user_account_info_path(file_name=file_name, profile=profile)
+        self.filename = self._get_user_account_info_path(file_name=file_name, profile=profile)
         logger.debug('%s file path to use: %s', self.__class__.__name__, self.filename)
 
         self._validate_database(last_upgrade_to_run)
@@ -90,7 +90,7 @@ def __init__(self, file_name=None, last_upgrade_to_run=None, profile=None):
         )
 
     @classmethod
-    def get_user_account_info_path(cls, file_name=None, profile=None):
+    def _get_user_account_info_path(cls, file_name=None, profile=None):
         if profile and not B2_ACCOUNT_INFO_PROFILE_NAME_REGEXP.match(profile):
             raise ValueError('Invalid profile name: {}'.format(profile))
 

test/unit/account_info/test_sqlite_account_info.py

@@ -76,54 +76,54 @@ def setup(self, monkeypatch):
 
     def test_invalid_profile_name(self):
         with pytest.raises(ValueError):
-            SqliteAccountInfo.get_user_account_info_path(profile='&@(*$')
+            SqliteAccountInfo._get_user_account_info_path(profile='&@(*$')
 
     def test_profile_and_file_name_conflict(self):
         with pytest.raises(ValueError):
-            SqliteAccountInfo.get_user_account_info_path(file_name='foo', profile='bar')
+            SqliteAccountInfo._get_user_account_info_path(file_name='foo', profile='bar')
 
     def test_profile_and_env_var_conflict(self, monkeypatch):
         monkeypatch.setenv(B2_ACCOUNT_INFO_ENV_VAR, 'foo')
         with pytest.raises(ValueError):
-            SqliteAccountInfo.get_user_account_info_path(profile='bar')
+            SqliteAccountInfo._get_user_account_info_path(profile='bar')
 
     def test_profile_and_xdg_config_env_var(self, monkeypatch):
         monkeypatch.setenv(XDG_CONFIG_HOME_ENV_VAR, os.path.join('~', 'custom'))
-        account_info_path = SqliteAccountInfo.get_user_account_info_path(profile='secondary')
+        account_info_path = SqliteAccountInfo._get_user_account_info_path(profile='secondary')
         assert account_info_path == os.path.expanduser(
             os.path.join('~', 'custom', 'b2', 'db-secondary.sqlite')
         )
 
     def test_profile(self):
-        account_info_path = SqliteAccountInfo.get_user_account_info_path(profile='foo')
+        account_info_path = SqliteAccountInfo._get_user_account_info_path(profile='foo')
         assert account_info_path == os.path.expanduser(os.path.join('~', '.b2db-foo.sqlite'))
 
     def test_file_name(self):
-        account_info_path = SqliteAccountInfo.get_user_account_info_path(
+        account_info_path = SqliteAccountInfo._get_user_account_info_path(
             file_name=os.path.join('~', 'foo')
         )
         assert account_info_path == os.path.expanduser(os.path.join('~', 'foo'))
 
     def test_env_var(self, monkeypatch):
         monkeypatch.setenv(B2_ACCOUNT_INFO_ENV_VAR, os.path.join('~', 'foo'))
-        account_info_path = SqliteAccountInfo.get_user_account_info_path()
+        account_info_path = SqliteAccountInfo._get_user_account_info_path()
         assert account_info_path == os.path.expanduser(os.path.join('~', 'foo'))
 
     def test_default_file_if_exists(self, monkeypatch):
         # ensure that XDG_CONFIG_HOME_ENV_VAR doesn't matter if default file exists
         monkeypatch.setenv(XDG_CONFIG_HOME_ENV_VAR, 'some')
         with open(os.path.expanduser(B2_ACCOUNT_INFO_DEFAULT_FILE), 'w') as account_file:
             account_file.write('')
-        account_info_path = SqliteAccountInfo.get_user_account_info_path()
+        account_info_path = SqliteAccountInfo._get_user_account_info_path()
         assert account_info_path == os.path.expanduser(B2_ACCOUNT_INFO_DEFAULT_FILE)
 
     def test_xdg_config_env_var(self, monkeypatch):
         monkeypatch.setenv(XDG_CONFIG_HOME_ENV_VAR, os.path.join('~', 'custom'))
-        account_info_path = SqliteAccountInfo.get_user_account_info_path()
+        account_info_path = SqliteAccountInfo._get_user_account_info_path()
         assert account_info_path == os.path.expanduser(
             os.path.join('~', 'custom', 'b2', 'account_info')
         )
 
     def test_default_file(self):
-        account_info_path = SqliteAccountInfo.get_user_account_info_path()
+        account_info_path = SqliteAccountInfo._get_user_account_info_path()
         assert account_info_path == os.path.expanduser(B2_ACCOUNT_INFO_DEFAULT_FILE)