Fix date format

horejsek · Nov 14, 2023 · 834c455 · 834c455
1 parent 38e0116
commit 834c455
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+=== UNRELEASED
+
+* Fixed date format to accept only two digit months and days
+
 === 2.19.0 (2023-11-14)
 
 * Added `use_formats` parameter to allow disable automatic assertions

diff --git a/fastjsonschema/draft07.py b/fastjsonschema/draft07.py
@@ -3,7 +3,7 @@
 
 class CodeGeneratorDraft07(CodeGeneratorDraft06):
     FORMAT_REGEXS = dict(CodeGeneratorDraft06.FORMAT_REGEXS, **{
-        'date': r'^(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})\Z',
+        'date': r'^(?P<year>\d{4})-(?P<month>\d{2})-(?P<day>\d{2})\Z',
         'iri': r'^\w+:(\/?\/?)[^\s]+\Z',
         'iri-reference': r'^(\w+:(\/?\/?))?[^#\\\s]*(#[^\\\s]*)?\Z',
         'idn-email': r'^[^@]+@[^@]+\.[^@]+\Z',

diff --git a/tests/test_format.py b/tests/test_format.py
@@ -37,6 +37,20 @@ def test_hostname(asserter, value, expected):
     asserter({'type': 'string', 'format': 'hostname'}, value, expected)
 
 
+exc = JsonSchemaValueException('data must be date', value='{data}', name='data', definition='{definition}', rule='format')
+@pytest.mark.parametrize('value, expected', [
+    ('', exc),
+    ('bla', exc),
+    ('2018-2-5', exc),
+    ('2018-02-05', '2018-02-05'),
+])
+def test_date(asserter, value, expected):
+    asserter({
+        '$schema': 'http://json-schema.org/draft-07/schema',
+        'format': 'date',
+    }, value, expected)
+
+
 exc = JsonSchemaValueException('data must be custom-format', value='{data}', name='data', definition='{definition}', rule='format')
 @pytest.mark.parametrize('value,expected,custom_format', [
     ('', exc, r'^[ab]$'),