From 5315b717c0359d6a0d7d6649ba4b574fcb5213bb Mon Sep 17 00:00:00 2001
From: Arthur Milchior <Arthur@Milchior.fr>
Date: Mon, 6 Apr 2020 22:20:51 +0200
Subject: [PATCH] _basename used where possible

---
 pylib/anki/decks.py    | 7 ++++---
 pylib/anki/template.py | 2 +-
 qt/aqt/browser.py      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pylib/anki/decks.py b/pylib/anki/decks.py
index 24052084e..a62fb83cd 100644
--- a/pylib/anki/decks.py
+++ b/pylib/anki/decks.py
@@ -126,7 +126,7 @@ class DeckManager:
             # child of an existing deck then it needs to be renamed
             deck = self.get(did)
             if "::" in deck["name"]:
-                base = self.path(deck["name"])[-1]
+                base = self._basename(deck["name"])
                 suffix = ""
                 while True:
                     # find an unused name
@@ -296,8 +296,9 @@ class DeckManager:
 
     _path = path
 
-    def _basename(self, name: str) -> Any:
-        return self.path(name)[-1]
+    @classmethod
+    def _basename(cls, name: str) -> Any:
+        return cls.path(name)[-1]
 
     @classmethod
     def key(cls, deck: Dict[str, Any]) -> List[str]:
diff --git a/pylib/anki/template.py b/pylib/anki/template.py
index 5ed110441..d98a1c2f8 100644
--- a/pylib/anki/template.py
+++ b/pylib/anki/template.py
@@ -154,7 +154,7 @@ def fields_for_rendering(
     fields["Tags"] = note.stringTags().strip()
     fields["Type"] = card.note_type()["name"]
     fields["Deck"] = col.decks.name(card.odid or card.did)
-    fields["Subdeck"] = DeckManager.path(fields["Deck"])[-1]
+    fields["Subdeck"] = DeckManager._basename(fields["Deck"])
     fields["Card"] = card.template()["name"]
     flag = card.userFlag()
     fields["CardFlag"] = flag and f"flag{flag}" or ""
diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py
index 1b487bb07..80b414c25 100644
--- a/qt/aqt/browser.py
+++ b/qt/aqt/browser.py
@@ -1303,7 +1303,7 @@ QTableView {{ gridline-color: {grid} }}
         def addDecks(parent, decks):
             for head, did, rev, lrn, new, children in decks:
                 name = self.mw.col.decks.get(did)["name"]
-                shortname = DeckManager.path(name)[-1]
+                shortname = DeckManager._basename(name)
                 if children:
                     subm = parent.addMenu(shortname)
                     subm.addItem(_("Filter"), self._filterFunc("deck", name))