Update qualification properties

Properly set qualification properties on
- UncertainOrApproximate
- Unspecified
- Level1Interval
- PartialUncertainOrApproximate
- Level2Interval

Adds tests to check that each EDTF object is parsed and that .is_approximate, .is_uncertain, and .is_uncertain_and_approximate are set to what we expect them to be

edtf/parser/parser_classes.py

@@ -91,7 +91,7 @@ def apply_delta(op, time_struct, delta):
 
 class EDTFObject:
     """
-    Object to attact to a parser to become instantiated when the parser
+    Object to attach to a parser to become instantiated when the parser
     completes.
     """
 
@@ -470,6 +470,11 @@ class UncertainOrApproximate(EDTFObject):
     def __init__(self, date, ua):
         self.date = date
         self.ua = ua
+        self.is_uncertain = ua.is_uncertain if ua else False
+        self.is_approximate = ua.is_approximate if ua else False
+        self.is_uncertain_and_approximate = (
+            ua.is_uncertain_and_approximate if ua else False
+        )
 
     def __str__(self):
         if self.ua:
@@ -558,6 +563,11 @@ def __init__(
             **kwargs,
         )
         self.ua = ua
+        self.is_uncertain = ua.is_uncertain if ua else False
+        self.is_approximate = ua.is_approximate if ua else False
+        self.is_uncertain_and_approximate = (
+            ua.is_uncertain_and_approximate if ua else False
+        )
         self.negative = self.year.startswith("-")
 
     def __str__(self):
@@ -709,6 +719,12 @@ def __init__(self, lower=None, upper=None):
             self.upper = UnspecifiedIntervalSection(
                 False, UncertainOrApproximate(**lower)
             )
+        self.is_approximate = self.lower.is_approximate or self.upper.is_approximate
+        self.is_uncertain = self.lower.is_uncertain or self.upper.is_uncertain
+        self.is_uncertain_and_approximate = (
+            self.lower.is_uncertain_and_approximate
+            or self.upper.is_uncertain_and_approximate
+        )
 
     def _get_fuzzy_padding(self, lean):
         if lean == EARLIEST:
@@ -840,6 +856,27 @@ def __init__(
 
         self.all_ua = all_ua
 
+        uas = [
+            year_ua,
+            month_ua,
+            day_ua,
+            year_month_ua,
+            month_day_ua,
+            season_ua,
+            all_ua,
+        ]
+        self.is_uncertain = any(
+            item.is_uncertain for item in uas if hasattr(item, "is_approximate")
+        )
+        self.is_approximate = any(
+            item.is_approximate for item in uas if hasattr(item, "is_approximate")
+        )
+        self.is_uncertain_and_approximate = any(
+            item.is_uncertain_and_approximate
+            for item in uas
+            if hasattr(item, "is_uncertain_and_approximate")
+        )
+
     def __str__(self):
         if self.season_ua:
             return f"{self.season}{self.season_ua}"
@@ -1046,6 +1083,12 @@ def __init__(self, lower, upper):
             self.upper = upper[0]
         else:
             self.upper = upper
+        self.is_approximate = self.lower.is_approximate or self.upper.is_approximate
+        self.is_uncertain = self.lower.is_uncertain or self.upper.is_uncertain
+        self.is_uncertain_and_approximate = (
+            self.lower.is_uncertain_and_approximate
+            or self.upper.is_uncertain_and_approximate
+        )
 
 
 class Level2Season(Season):

edtf/parser/tests.py

@@ -240,6 +240,24 @@
     "2001-29",
 )
 
+APPROXIMATE_UNCERTAIN_EXAMPLES = (
+    # first part of tuple is the input EDTF string, second part is a tuple of booleans:
+    # uncertain ?, approximate ~, both uncertain and approximate %
+    ("2004", (False, False, False)),
+    ("2006-06-11", (False, False, False)),
+    ("-0999", (False, False, False)),
+    ("1984?", (True, False, False)),
+    ("2004-06-11?", (True, False, False)),
+    ("1984~", (False, True, False)),
+    ("1984%", (False, False, True)),
+    ("1984~/2004-06", (False, True, False)),
+    ("2004-%06", (False, False, True)),
+    ("2004?-~06-~04", (True, True, False)),
+    ("2011-~06-~04", (False, True, False)),
+    ("2004-06-~01/2004-06-~20", (False, True, False)),
+    ("156X~", (False, True, False)),
+)
+
 BAD_EXAMPLES = (
     # parentheses are not used for group qualification in the 2018 spec
     None,
@@ -379,3 +397,17 @@ def test_comparisons():
 def test_benchmark_parser(benchmark, test_input):
     """Benchmark parsing of selected EDTF strings."""
     benchmark(parse, test_input)
+
+
+@pytest.mark.parametrize("test_input,expected_tuple", APPROXIMATE_UNCERTAIN_EXAMPLES)
+def test_approximate_uncertain(test_input, expected_tuple):
+    """Test parsing of EDTF strings and check .is_uncertain, .is_approximate,
+    and .is_uncertain_and_approximate properties. The expected_tuple should have three
+    values, the first should be a boolean indicating if the date is uncertain,
+    the second should be a boolean indicating if the date is approximate, and the
+    third should be a boolean indicating if the date is both uncertain and approximate."""
+    result = parse(test_input)
+    assert isinstance(result, EDTFObject), "Result should be an instance of EDTFObject"
+    assert result.is_uncertain == expected_tuple[0]
+    assert result.is_approximate == expected_tuple[1]
+    assert result.is_uncertain_and_approximate == expected_tuple[2]