Simplify formatting for string parameters in repr methods

Author: rlskoeser

src/undate/interval.py

@@ -73,7 +73,7 @@ def __repr__(self) -> str:
         init_opts = {
             "earliest": repr(self.earliest) if self.earliest else None,
             "latest": repr(self.latest) if self.latest else None,
-            "label": f'"{self.label}"' if self.label else None,
+            "label": f"{self.label!r}" if self.label else None,
         }
         init_str = ", ".join(
             [f"{key}={val}" for key, val in init_opts.items() if val is not None]

src/undate/undate.py

@@ -251,15 +251,14 @@ def __str__(self) -> str:
 
     def __repr__(self) -> str:
         init_opts = {k: v for k, v in self.initial_values.items() if v is not None}
+        # include label if set
         if self.label:
             init_opts["label"] = self.label
+        # always include calendar
         init_opts["calendar"] = self.calendar.value.title()
-        init_params = []
-        for key, val in init_opts.items():
-            if isinstance(val, str):
-                val = f'"{val}"'
-            init_params.append(f"{key}={val}")
-        return f"undate.Undate({', '.join(init_params)})"
+        # combine parameters; use !r to quote strings
+        init_str = ", ".join([f"{key}={val!r}" for key, val in init_opts.items()])
+        return f"undate.Undate({init_str})"
 
     @classmethod
     def parse(cls, date_string, format) -> Union["Undate", UndateInterval]:

tests/test_interval.py

@@ -71,7 +71,7 @@ def test_repr(self):
         fancy_epoch = UndateInterval(Undate(2022), Undate(2023), label="Fancy Epoch")
         assert (
             repr(fancy_epoch)
-            == f'undate.UndateInterval(earliest={repr(fancy_epoch.earliest)}, latest={repr(fancy_epoch.latest)}, label="Fancy Epoch")'
+            == f"undate.UndateInterval(earliest={repr(fancy_epoch.earliest)}, latest={repr(fancy_epoch.latest)}, label='Fancy Epoch')"
         )
         assert eval(repr(fancy_epoch)) == fancy_epoch
 

tests/test_undate.py

@@ -36,26 +36,26 @@ def test_repr(self):
         # repr string should provide sufficient details to initialize
         assert (
             repr(nov2022)
-            == 'undate.Undate(year=2022, month=11, day=7, calendar="Gregorian")'
+            == "undate.Undate(year=2022, month=11, day=7, calendar='Gregorian')"
         )
         # eval on repr string should be equivalent to the object
         assert eval(repr(nov2022)) == nov2022
         nov2022_labeled = Undate(2022, 11, 7, label="A Special Day")
         assert (
             repr(nov2022_labeled)
-            == 'undate.Undate(year=2022, month=11, day=7, label="A Special Day", calendar="Gregorian")'
+            == "undate.Undate(year=2022, month=11, day=7, label='A Special Day', calendar='Gregorian')"
         )
         assert eval(repr(nov2022_labeled)) == nov2022_labeled
         # different calendar, missing fields
         islamic_date = Undate(484, calendar=Calendar.ISLAMIC)
-        assert repr(islamic_date) == 'undate.Undate(year=484, calendar="Islamic")'
+        assert repr(islamic_date) == "undate.Undate(year=484, calendar='Islamic')"
         assert eval(repr(islamic_date)) == islamic_date
 
         # test string values for month/day
         unknown_year = Undate(month="1X", day="3X")
         assert (
             repr(unknown_year)
-            == 'undate.Undate(month="1X", day="3X", calendar="Gregorian")'
+            == "undate.Undate(month='1X', day='3X', calendar='Gregorian')"
         )
         # unknown dates aren't equal, but string representation should match
         assert str(eval(repr(unknown_year))) == str(unknown_year)