diff --git a/conservancy_beancount/reports/core.py b/conservancy_beancount/reports/core.py index 524e7291dfe55e31478b211fcead70c70b1259e3..4e52f43db59d2de8ed923f72a4c27691f04fef42 100644 --- a/conservancy_beancount/reports/core.py +++ b/conservancy_beancount/reports/core.py @@ -920,13 +920,13 @@ class BaseODS(BaseSpreadsheet[RT, ST], metaclass=abc.ABCMeta): if not flags: raise ValueError(f"no valid edges in {edges!r}") border_attr = f'{width} {style} {color}' - key = f'{",".join(f.name for f in flags)} {border_attr}' + key = f'{",".join(str(f.name) for f in flags)} {border_attr}' try: retval = self._style_cache[key] except KeyError: props = odf.style.TableCellProperties() for flag in flags: - props.setAttribute(f'border{flag.name.lower()}', border_attr) + props.setAttribute(f'border{str(flag.name).lower()}', border_attr) retval = odf.style.Style( name=f'Border{next(self._name_counter)}', family='table-cell', diff --git a/conservancy_beancount/reports/ledger.py b/conservancy_beancount/reports/ledger.py index c22e1e0b4c36ede09344af221ef7594cb07dbf58..16bedd455e9f40f38e178f3f8a486d283fc761fb 100644 --- a/conservancy_beancount/reports/ledger.py +++ b/conservancy_beancount/reports/ledger.py @@ -531,7 +531,7 @@ class ReportType(enum.IntFlag): return cls.DEBIT_TRANSACTIONS def _choices_sortkey(self) -> Sortable: - subtype, _, maintype = self.name.partition('_') + subtype, _, maintype = str(self.name).partition('_') return (maintype, subtype) @@ -726,7 +726,7 @@ date was also not specified. type=report_type.enum_type, default=report_type_default, help=f"""The type of report to generate. Choices are -{report_type.choices_str()}. Default is {report_type_default.name.lower()!r}. +{report_type.choices_str()}. Default is {str(report_type_default.name).lower()!r}. """) # --transactions got merged into --report-type; this is backwards compatibility. parser.add_argument( diff --git a/conservancy_beancount/reports/rewrite.py b/conservancy_beancount/reports/rewrite.py index 6266ffb2b87327e421d44ceb476fe918f6b26307..056a7e1b0d5216e3a07bd40ed104eef2541ad31f 100644 --- a/conservancy_beancount/reports/rewrite.py +++ b/conservancy_beancount/reports/rewrite.py @@ -553,7 +553,7 @@ class RewriteRuleset: if isinstance(source, str): name = '' else: - name = getattr(source, 'name', '') + name = str(getattr(source, 'name', '')) try: doc = yaml.safe_load(source) except yaml.error.YAMLError as error: