NPO-Accounting/conservancy_beancount Changeset - 6a3d64ff2250

Changeset - 6a3d64ff2250

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 3 years ago 2021-01-09 15:49:04
brettcsmith@brettcsmith.org

fields: Change FieldType capitalization.

This is friendlier to the YAML input and consistent with FieldFlags.
Less consistent with the rest of the codebase, but local consistency matters
more IMO.

3 files changed with 10 insertions and 11 deletions:

conservancy_beancount/pdfforms/fields.py

setup.py

tests/test_pdfforms_fields.py

0 comments (0 inline, 0 general)

conservancy_beancount/pdfforms/fields.py

➞

Show inline comments

@@ ... / @@ -52,16 +52,15 @@ class FieldFlags(enum.IntFlag): @@
 class FieldType(enum.Enum):
     Btn = 'Btn'
-    BUTTON = Btn
+    Button = Btn
     Ch = 'Ch'
-    CHOICE = Ch
+    Choice = Ch
     Sig = 'Sig'
     SIG = Sig
     SIGNATURE = Sig
     Signature = Sig
     Tx = 'Tx'
-    TEXT = Tx
+    Text = Tx
 class FormField:
     __slots__ = ['_source']
@@ ... / @@ -86,16 +85,16 @@ class FormField: @@
             field_type = retval.field_type()
         except ValueError:
             return retval
         flags = retval.flags()
-        if field_type is FieldType.BUTTON:
+        if field_type is FieldType.Button:
             if flags & FieldFlags.Radio:
                 pass
             elif flags & FieldFlags.Pushbutton:
                 pass
             else:
                 retval.__class__ = CheckboxField
-        elif field_type is FieldType.TEXT:
+        elif field_type is FieldType.Text:
             retval.__class__ = TextField
         return retval
     def _get_value(self, key: str, default: Any=_SENTINEL) -> Any:

setup.py

➞

Show inline comments

@@ ... / @@ -4,9 +4,9 @@ from setuptools import setup @@
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.15.0',
+    version='1.15.1',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',

tests/test_pdfforms_fields.py

➞

Show inline comments

@@ ... / @@ -64,17 +64,17 @@ def test_empty_field(): @@
 def test_text_field_base():
     source = field_source(b's', b'string of text', 'Tx')
     field = fieldsmod.FormField(source)
-    assert field.field_type() is fieldsmod.FieldType.TEXT
+    assert field.field_type() is fieldsmod.FieldType.Text
     assert field.name() == 's'
     assert field.value() == b'string of text'
 @pytest.mark.parametrize('value', ['Off', 'Yes', 'On'])
 def test_checkbox_field_base(value):
     source = field_source(b'cb', value, 'Btn', literal=True)
     field = fieldsmod.FormField(source)
-    assert field.field_type() is fieldsmod.FieldType.BUTTON
+    assert field.field_type() is fieldsmod.FieldType.Button
     assert field.name() == 'cb'
     assert field.value().name == value
 @pytest.mark.parametrize('flags', range(4))
@@ ... / @@ -113,9 +113,9 @@ def test_inheritance(): @@
     assert parent.name() == 'parent'
     assert not parent.is_terminal()
     assert field.is_terminal()
     assert field.name() == 'kid'
-    assert field.field_type() is fieldsmod.FieldType.TEXT
+    assert field.field_type() is fieldsmod.FieldType.Text
     assert field.value() == 'parent value'
     assert field.flags() == 17
     assert not list(field.kids())

0 comments (0 inline, 0 general)