From 910e5577768aaeb844f59a1bdb4b2ea8f6c13e53 Mon Sep 17 00:00:00 2001 From: flan Date: Thu, 2 Nov 2017 19:32:10 +0100 Subject: [PATCH] Rename username2dirname() to userdir() --- ankisyncd/sync_app.py | 2 +- ankisyncd/users.py | 2 +- tests/test_users.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ankisyncd/sync_app.py b/ankisyncd/sync_app.py index 6b18c26..3ca29dc 100644 --- a/ankisyncd/sync_app.py +++ b/ankisyncd/sync_app.py @@ -413,7 +413,7 @@ class SyncApp(object): if not self.user_manager.authenticate(username, password): return - dirname = self.user_manager.username2dirname(username) + dirname = self.user_manager.userdir(username) if dirname is None: return diff --git a/ankisyncd/users.py b/ankisyncd/users.py index 830f978..1f7cce7 100644 --- a/ankisyncd/users.py +++ b/ankisyncd/users.py @@ -20,7 +20,7 @@ class SimpleUserManager(object): return True - def username2dirname(self, username): + def userdir(self, username): """ Returns the directory name for the given user. By default, this is just the username. Override this to adjust the mapping between users and diff --git a/tests/test_users.py b/tests/test_users.py index b102713..de300f5 100644 --- a/tests/test_users.py +++ b/tests/test_users.py @@ -28,9 +28,9 @@ class SimpleUserManagerTest(unittest.TestCase): self.assertTrue(self.user_manager.authenticate(bad_test_un, good_test_pw)) - def test_username2dirname(self): + def test_userdir(self): username = 'my_username' - dirname = self.user_manager.username2dirname(username) + dirname = self.user_manager.userdir(username) self.assertEqual(dirname, username)