Merge pull request #27 from theme-ontology/bugfix-emptyingfield

Bugfix emptying entry

Author: paul-sheridan

tests/utils/test_mergelist.py

@@ -63,6 +63,9 @@ def test_badrow_raises(self):
         rows[0].rtheme = ''
         with pytest.raises(ValueError):
             totolo.util.mergelist.get_changes(rows, totolo.empty())
+        rows[0].theme = ''
+        with pytest.raises(ValueError):
+            totolo.util.mergelist.get_changes(rows, totolo.empty())
 
     def test_badrow_action_raises(self):
         with pytest.raises(ValueError):

totolo/__init__.py

@@ -2,7 +2,7 @@
 The Python interface to themeontology.org.
 """
 
-__version__ = "1.7.3"
+__version__ = "1.8.0"
 
 from totolo.api import TORemote, empty, files
 

totolo/impl/entry.py

@@ -62,7 +62,7 @@ def __setitem__(self, key, value):
             field = TOField(
                 name=key,
                 fieldtype="blob",
-                source=[data],
+                source=[':: ' + self.name] + [data],
                 parts=[data],
             )
         self.fields[key] = field.setup()

totolo/impl/field.py

@@ -12,6 +12,7 @@ class TOField(TOObject):
     source = a(list)
     parts = a(list)
     frozen = a(False)
+    __initialized = False
 
     def __iadd__(self, other):
         assert isinstance(other, TOField)
@@ -144,8 +145,9 @@ def find_kw(self, match_keyword):
         return None
 
     def setup(self):
-        if not self.parts and not self.frozen:
+        if not self.__initialized and not self.parts and not self.frozen:
             # this used to be done immediately but is now defered for efficiency
             from .parser import TOParser  # pylint: disable=cyclic-import
             TOParser.init_field(self)
+            self.__initialized = True
         return self

totolo/impl/parser.py

@@ -130,6 +130,7 @@ def make_field(cls, lines, fieldtype):
     @classmethod
     def init_field(cls, field):
         fieldtype = field.fieldtype
+        field.parts.clear()
         if fieldtype == "kwlist":
             data_iter = islice(field.source, 1, 1000)
             for kwtuple in TOParser.iter_kwitems(data_iter):

totolo/util/mergelist.py

@@ -102,9 +102,12 @@ def get_changes(rows, ontology):
 
     for row in rows:
         if not row.theme or not row.weight:
-            newentries[row.sid][row.rweight].append([
-                row.rtheme, row.rmotivation, row.rcapacity
-            ])
+            if row.rtheme:
+                newentries[row.sid][row.rweight].append([
+                    row.rtheme, row.rmotivation, row.rcapacity
+                ])
+            else:
+                raise ValueError(f"Unexpected row configuration (no theme/weight): {row}")
         elif not any([row.rtheme, row.rweight, row.rmotivation, row.rcapacity]):
             deletions[(row.sid, row.weight, row.theme)] = True
         elif row.rtheme and row.rweight: