Merge pull request #98 from Ryton/main

Minor change wrt typecheck (int vs float)

Author: wimglenn

aocd/models.py

@@ -261,6 +261,14 @@ def _repr_pretty_(self, p, cycle):
             template = "<{0}({1.year}, {1.day}) at {2} - {1.title}>"
             p.text(template.format(type(self).__name__, self, hex(id(self))))
 
+    def _coerce_val(self, val):
+        if isinstance(val, float) and val.is_integer():
+            log.warning("coerced value %r for %d/%02d", val, self.year, self.day)
+            val = int(val)
+        if isinstance(val, int):
+            val = str(val)
+        return val
+
     @property
     def answer_a(self):
         try:
@@ -270,8 +278,7 @@ def answer_a(self):
 
     @answer_a.setter
     def answer_a(self, val):
-        if isinstance(val, int):
-            val = str(val)
+        val = self._coerce_val(val)
         if getattr(self, "answer_a", None) == val:
             return
         self._submit(value=val, part="a")
@@ -289,8 +296,7 @@ def answer_b(self):
 
     @answer_b.setter
     def answer_b(self, val):
-        if isinstance(val, int):
-            val = str(val)
+        val = self._coerce_val(val)
         if getattr(self, "answer_b", None) == val:
             return
         self._submit(value=val, part="b")
@@ -325,7 +331,8 @@ def incorrect_answers_b(self):
     def _submit(self, value, part, reopen=True, quiet=False):
         if value in {u"", b"", None, b"None", u"None"}:
             raise AocdError("cowardly refusing to submit non-answer: {!r}".format(value))
-        value = str(value)
+        if not isinstance(value, str):
+            value = self._coerce_val(value)
         part = str(part).replace("1", "a").replace("2", "b").lower()
         if part not in {"a", "b"}:
             raise AocdError('part must be "a" or "b"')

aocd/version.py

@@ -1 +1 @@
-__version__ = "1.3.1"
+__version__ = "1.3.2"

tests/test_submit.py

@@ -1,4 +1,5 @@
 import errno
+import logging
 
 import pytest
 from termcolor import colored
@@ -252,11 +253,19 @@ def test_will_not_submit_null():
         submit(None, part="a")
 
 
-@pytest.mark.answer_not_cached(rv='value')
+@pytest.mark.answer_not_cached(rv="value")
 def test_submit_guess_against_saved(requests_mock, capsys):
-    post = requests_mock.post(
-        url="https://adventofcode.com/2018/day/1/answer",
-        text="<article>That's the right answer. Yeah!!</article>",
-    )
+    post = requests_mock.post(url="https://adventofcode.com/2018/day/1/answer")
     submit(1234, part="a", day=1, year=2018, session="whatever", reopen=False)
     assert post.call_count == 0
+
+
+def test_submit_float_warns(requests_mock, capsys, caplog):
+    post = requests_mock.post(
+        url="https://adventofcode.com/2022/day/8/answer",
+        text="<article>yeah</article>",
+    )
+    submit(1234.0, part="a", day=8, year=2022, session="whatever", reopen=False)
+    assert post.call_count == 1
+    log_record = ("aocd.models", logging.WARNING, "coerced value 1234.0 for 2022/08")
+    assert log_record in caplog.record_tuples