Fix lint.

Author: jzohrab

.pylintrc

@@ -25,7 +25,7 @@ disable=too-few-public-methods, duplicate-code
 # Argument names that match this expression will be ignored.
 # This includes some pytest fixtures that are "setup" methods for functions:
 # app_context, empty_db, etc
-ignored-argument-names=app_context|empty_db|dummy|^ignored_|^unused_
+ignored-argument-names=app_context|empty_db|dummy|^ignored_|^unused_,|^_
 
 
 ### placeholder - available settings

lute/term/model.py

@@ -6,11 +6,11 @@
 """
 
 from lute.db import db
-from lute.models.term import Term as DBTerm, TermTag, TermFlashMessage, TermImage
+from lute.models.term import Term as DBTerm, TermTag
 from lute.models.language import Language
 
 
-class Term:
+class Term: # pylint: disable=too-many-instance-attributes
     """
     Term business object.  All class members are primitives.
     """
@@ -34,8 +34,8 @@ class Repository:
     Maps Term BO to and from lute.model.Term.
     """
 
-    def __init__(self, db):
-        self.db = db
+    def __init__(self, _db):
+        self.db = _db
 
 
     def find_by_id(self, term_id):
@@ -93,9 +93,9 @@ def _build_db_term(self, term):
         "Convert a term business object to a DBTerm."
         lang = Language.find(term.language_id)
         if lang is None:
-            raise Exception(f'Unknown language {term.language_id} for term')
+            raise ValueError(f'Unknown language {term.language_id} for term')
         if term.text is None:
-            raise Exception('Text not set for term')
+            raise ValueError('Text not set for term')
 
         t = self._find_db_term_by_langid_and_text(lang.id, term.text)
         if t is None:
@@ -168,10 +168,9 @@ def _build_business_term(self, dbterm):
         term.status = dbterm.status
         term.translation = dbterm.translation
         term.romanization = dbterm.romanization
-        term.token_count = dbterm.token_count
         term.current_image = dbterm.get_current_image()
         term.flash_message = dbterm.get_flash_message()
-        term.term_parents = [p.text for p in dbterm.parents]
+        term.parents = [p.text for p in dbterm.parents]
         term.romanization = dbterm.romanization
         term.term_tags = [tt.text for tt in dbterm.term_tags]
 

tests/unit/models/test_TermTag.py

@@ -9,38 +9,45 @@
 from tests.dbasserts import assert_sql_result
 
 
-@pytest.fixture(name="hola_tag")
-def fixture_hola_tag(spanish, app_context):
+@pytest.fixture(name="_hola_tag")
+def fixture_hola_tag(app_context):
+    "A dummy tag for tests."
     t = TermTag("Hola", "Hola comment")
     db.session.add(t)
     db.session.commit()
 
 
-def test_save(hola_tag, app_context):
+def test_save(_hola_tag, app_context):
+    "Save saves!"
     sql = "select TgID, TgText, TgComment from tags"
     expected = ["1; Hola; Hola comment"]
     assert_sql_result(sql, expected)
 
 
-def test_new_dup_tag_text_fails(hola_tag, spanish, app_context):
+def test_new_dup_tag_text_fails(_hola_tag, app_context):
+    "Smoke test of db integrity."
     t2 = TermTag("Hola", "dup")
     db.session.add(t2)
     with pytest.raises(Exception):
         db.session.commit()
 
 
-def test_find_by_text(hola_tag, app_context):
+def test_find_by_text(_hola_tag, app_context):
+    "Find by text returns match."
     retrieved = TermTag.find_by_text("Hola")
     assert retrieved is not None
     assert retrieved.text == "Hola"
 
 
-def test_find_by_text_returns_null_if_not_exact_match(hola_tag, app_context):
+def test_find_by_text_returns_null_if_not_exact_match(_hola_tag, app_context):
+    "Find returns null if no match."
+    # TODO check if used: this method feels useless.
     assert TermTag.find_by_text("unknown") is None
     assert TermTag.find_by_text("hola") is None
 
 
-def test_find_or_create_by_text_returns_new_if_no_match(hola_tag, app_context):
+def test_find_or_create_by_text_returns_new_if_no_match(_hola_tag, app_context):
+    "Return new."
     assert TermTag.find_by_text("unknown") is None
     t = TermTag.find_or_create_by_text("unknown")
     assert t.text == 'unknown', 'new tag created'