diff --git a/conservancy_beancount/pdfforms/fields.py b/conservancy_beancount/pdfforms/fields.py index e8786e461d64abca6e4fb04254a4f7a97b486689..444255bf0754cbbd3a4e5276582f13a2c3f15def 100644 --- a/conservancy_beancount/pdfforms/fields.py +++ b/conservancy_beancount/pdfforms/fields.py @@ -53,14 +53,13 @@ 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: @@ -87,14 +86,14 @@ class FormField: 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 diff --git a/setup.py b/setup.py index 9b070f960dff5727ab71ee49de13a69c7232d2fd..bfef667b2a881cd737aba47280103f8418c68984 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ 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+', diff --git a/tests/test_pdfforms_fields.py b/tests/test_pdfforms_fields.py index 5ff3475be90e42fc33f62b11a12affaaae62ece7..1cd72ee9c5e6b1b2c85d222cc0ce78c860e3bc59 100644 --- a/tests/test_pdfforms_fields.py +++ b/tests/test_pdfforms_fields.py @@ -65,7 +65,7 @@ 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' @@ -73,7 +73,7 @@ def test_text_field_base(): 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 @@ -114,7 +114,7 @@ def test_inheritance(): 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())