Fix default encoding for dates without explicit flag in c module

Sekenre · Oct 28, 2019 · 9927bb5 · 9927bb5
1 parent 59f3946
commit 9927bb5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cbor2/encoder.py b/cbor2/encoder.py
@@ -345,7 +345,7 @@ def encode_datetime(self, value):
             self.encode_semantic(CBORTag(0, datestring))
 
     def encode_date(self, value):
-        value = datetime.combine(value, time()).replace(tzinfo=timezone.utc)
+        value = datetime.combine(value, time()).replace(tzinfo=self._timezone)
         self.encode_datetime(value)
 
     def encode_decimal(self, value):

diff --git a/source/encoder.c b/source/encoder.c
@@ -123,7 +123,7 @@ CBOREncoder_init(CBOREncoderObject *self, PyObject *args, PyObject *kwargs)
     PyObject *tmp, *fp = NULL, *default_handler = NULL, *tz = NULL,
     *date_as_datetime = NULL;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|pOpOBO", keywords,
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|pOpOpp", keywords,
                 &fp, &self->timestamp_format, &tz, &self->value_sharing,
                 &default_handler, &self->enc_style, &date_as_datetime))
         return -1;
@@ -1805,8 +1805,6 @@ encode(CBOREncoderObject *self, PyObject *value)
                 return CBOREncoder_encode_map(self, value);
             else if (PyDateTime_CheckExact(value))
                 return CBOREncoder_encode_datetime(self, value);
-            else if (PyDate_CheckExact(value))
-                return CBOREncoder_encode_date(self, value);
             else if (PyAnySet_CheckExact(value))
                 return CBOREncoder_encode_set(self, value);
             // fall-thru

diff --git a/tests/test_encoder.py b/tests/test_encoder.py
@@ -234,10 +234,12 @@ def test_datetime(impl, value, as_timestamp, expected):
     expected = unhexlify(expected)
     assert impl.dumps(value, datetime_as_timestamp=as_timestamp, timezone=timezone.utc) == expected
 
-
-def test_date(impl):
+@pytest.mark.parametrize('tz', [None, timezone.utc], ids=['no timezone', 'utc'])
+def test_date_fails(impl, tz):
+    encoder = impl.CBOREncoder(BytesIO(b''), timezone=tz, date_as_datetime=False)
+    assert date not in encoder._encoders
     with pytest.raises(impl.CBOREncodeError):
-        impl.dumps(date(2013, 3, 21))
+        encoder.encode(date(2013, 3, 21))
 
 
 def test_date_as_datetime(impl):