NPO-Accounting/conservancy_beancount Changeset - 5978c2f0c244

Changeset - 5978c2f0c244

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-28 03:12:35
brettcsmith@brettcsmith.org

reports: Remove BaseODS.style_dividerline.

Obsoleted by the new border_style() method.

2 files changed with 5 insertions and 12 deletions:

conservancy_beancount/reports/core.py

tests/test_reports_spreadsheet.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/core.py

➞

Show inline comments

@@ ... @@
         This method is called by __init__ to populate
         ``self.document.styles``. This implementation creates basic building
         block cell styles often used in financial reports.
         """
         styles = self.document.styles
         self.style_bold = self.ensure_child(
             styles, odf.style.Style, name='Bold', family='table-cell',
+        )
         self.ensure_child(
             self.style_bold, odf.style.TextProperties, fontweight='bold',
+        )
         self.style_dividerline = self.ensure_child(
             styles, odf.style.Style, name='DividerLine', family='table-cell',
+        )
         self.ensure_child(
             self.style_dividerline,
             odf.style.TableCellProperties,
             borderbottom='1pt solid #0000ff',
+        )
         date_style = self.replace_child(styles, odf.number.DateStyle, name='ISODate')
         date_style.addElement(odf.number.Year(style='long'))
         date_style.addElement(odf.number.Text(text='-'))
         date_style.addElement(odf.number.Month(style='long'))
         date_style.addElement(odf.number.Text(text='-'))
         date_style.addElement(odf.number.Day(style='long'))
         self.style_date = self.ensure_child(
             styles,
             odf.style.Style,
             name=f'{date_style.getAttribute("name")}Cell',
             family='table-cell',

tests/test_reports_spreadsheet.py

➞

Show inline comments

@@ ... / @@ -292,25 +292,24 @@ def test_ods_currency_style_caches(ods_writer): @@
 def test_ods_currency_style_cache_considers_properties(ods_writer):
     bold_text = odf.style.TextProperties(fontweight='bold')
     plain = ods_writer.currency_style('USD')
     bold = ods_writer.currency_style('USD', positive_properties=bold_text)
     assert plain is not bold
     assert plain.getAttribute('name') != bold.getAttribute('name')
     assert plain.getAttribute('datastylename') != bold.getAttribute('datastylename')
 @pytest.mark.parametrize('attr_name,child_type,checked_attr', [
     ('style_bold', odf.style.TextProperties, 'fontweight'),
     ('style_centertext', odf.style.ParagraphProperties, 'textalign'),
     ('style_dividerline', odf.style.TableCellProperties, 'borderbottom'),
     ('style_endtext', odf.style.ParagraphProperties, 'textalign'),
     ('style_starttext', odf.style.ParagraphProperties, 'textalign'),
 ])
 def test_ods_writer_style(ods_writer, attr_name, child_type, checked_attr):
     root = ods_writer.document.styles
     style = getattr(ods_writer, attr_name)
     actual = get_child(root, odf.style.Style, name=style.getAttribute('name'))
     assert actual is style
     child = get_child(actual, child_type)
     assert child.getAttribute(checked_attr)
 @pytest.mark.parametrize('edges,width,style,color', [
@@ ... / @@ -345,25 +344,26 @@ def test_ods_writer_border_style_caches(ods_writer): @@
     ('width', '1px', '2px'),
     ('color', '#0000fe', '#0000ff'),
 ])
 def test_ods_writer_border_no_caching(ods_writer, argname, val1, val2):
     kwargs = {'edges': core.Border.TOP}
     kwargs[argname] = val1
     style1 = ods_writer.border_style(**kwargs)
     kwargs[argname] = val2
     style2 = ods_writer.border_style(**kwargs)
     assert style1 is not style2
 def test_ods_writer_merge_styles(ods_writer):
     style = ods_writer.merge_styles(ods_writer.style_bold, ods_writer.style_dividerline)
     border_style = ods_writer.border_style(core.Border.BOTTOM)
     style = ods_writer.merge_styles(ods_writer.style_bold, border_style)
     actual = get_child(
         ods_writer.document.styles,
         odf.style.Style,
         name=style.getAttribute('name'),
+    )
     assert actual is style
     assert actual.getAttribute('family') == 'table-cell'
     text_props = get_child(actual, odf.style.TextProperties)
     assert text_props.getAttribute('fontweight') == 'bold'
     cell_props = get_child(actual, odf.style.TableCellProperties)
     assert cell_props.getAttribute('borderbottom')
@@ ... @@
     actual = get_child(
         ods_writer.document.styles,
         odf.style.Style,
         name=style.getAttribute('name'),
+    )
     assert actual is style
     assert actual.getAttribute('family') == 'table-cell'
     assert actual.getAttribute('datastylename') == jpy_style.getAttribute('datastylename')
     text_props = get_child(actual, odf.style.TextProperties)
     assert text_props.getAttribute('fontweight') == 'bold'
 def test_ods_writer_merge_styles_caches(ods_writer):
-    sources = [ods_writer.style_bold, ods_writer.style_dividerline]
+    sources = [ods_writer.style_bold, ods_writer.style_centertext]
     style1 = ods_writer.merge_styles(*sources)
     style2 = ods_writer.merge_styles(*reversed(sources))
     assert style1 is style2
     assert get_child(
         ods_writer.document.styles,
         odf.style.Style,
         name=style1.getAttribute('name'),
+    )
 def test_ods_writer_layer_merge_styles(ods_writer):
     usd_style = ods_writer.currency_style('USD')
     layer1 = ods_writer.merge_styles(ods_writer.style_bold, ods_writer.style_dividerline)
     border_style = ods_writer.border_style(core.Border.BOTTOM)
     layer1 = ods_writer.merge_styles(ods_writer.style_bold, border_style)
     layer2 = ods_writer.merge_styles(layer1, usd_style)
     style_name = layer2.getAttribute('name')
     assert style_name.count('Merge_') == 1
     actual = get_child(
         ods_writer.document.styles,
         odf.style.Style,
         name=style_name,
+    )
     assert actual is layer2
     assert actual.getAttribute('family') == 'table-cell'
     assert actual.getAttribute('datastylename') == usd_style.getAttribute('datastylename')
     text_props = get_child(actual, odf.style.TextProperties)

0 comments (0 inline, 0 general)