#782: Use isoduration instead of isodate for duration format validation, remove duration format test skips

nezhar · nezhar · commit 7a63ea3c14e3 · 2021-06-18T16:15:59.000+02:00
diff --git a/jsonschema/_format.py b/jsonschema/_format.py
@@ -462,15 +462,15 @@ def is_uri_template(
 
 
 try:
-    import isodate
+    import isoduration
 except ImportError:
     pass
 else:
     @_checks_drafts(
         draft202012="duration",
-        raises=isodate.ISO8601Error,
+        raises=isoduration.DurationParsingException,
     )
     def is_duration(instance):
         if not isinstance(instance, str):
             return True
-        return isodate.parse_duration(instance)
+        return isoduration.parse_duration(instance)
diff --git a/jsonschema/tests/test_jsonschema_test_suite.py b/jsonschema/tests/test_jsonschema_test_suite.py
@@ -172,29 +172,6 @@ def format_validation_annotation(test):
     )(test)
 
 
-def duration_format_validation(test):
-    """
-    isodata.parse_duration allows some formats that should not be parsed
-    """
-    return skip(
-        message=bug(),
-        subject="duration",
-        description='no time elements present',  # P1YT
-    )(test) or skip(
-        message=bug(),
-        subject="duration",
-        description='weeks cannot be combined with other units',  # P1Y2W
-    )(test) or skip(
-        message=bug(),
-        subject="duration",
-        description='zero time, in days',  # P0D
-    )(test) or skip(
-        message=bug(),
-        subject="duration",
-        description='zero time, in seconds',  # PT0S
-    )(test)
-
-
 def ecmascript_regex_validation(test):
     """
     Considering switching from re to js-regex after the following issues are resolved:
@@ -642,7 +619,6 @@ def ecmascript_regex_validation(test):
         or leap_second(test)
         or missing_format(draft202012_format_checker)(test)
         or complex_email_validation(test)
-        or duration_format_validation(test)
         or format_validation_annotation(test)
         or ecmascript_regex_validation(test)
         or skip(
diff --git a/setup.cfg b/setup.cfg
@@ -38,15 +38,15 @@ format =
     rfc3987
     strict-rfc3339
     webcolors
-    isodate
+    isoduration
 format_nongpl =
     fqdn
     idna
     jsonpointer>1.13
     webcolors
     rfc3986-validator>0.1.0
     rfc3339-validator
-    isodate
+    isoduration
 
 [options.entry_points]
 console_scripts =
