Merge pull request #78 from peichman-umd/year-ua

Handle UA markers to the left of the year segment

Author: aweakley

edtf/parser/parser_classes.py

@@ -858,6 +858,7 @@ def __init__(
 
         uas = [
             year_ua,
+            year_ua_b,
             month_ua,
             day_ua,
             year_month_ua,
@@ -886,7 +887,10 @@ def __str__(self):
         else:
             y = f"{self.year_ua_b}{self.year}" if self.year_ua_b else str(self.year)
 
-        m = f"{self.month_ua}{self.month}" if self.month_ua else str(self.month)
+        if self.month:
+            m = f"{self.month_ua}{self.month}" if self.month_ua else str(self.month)
+        else:
+            m = None
 
         if self.day:
             d = f"{self.day_ua}{self.day}" if self.day_ua else str(self.day)
@@ -902,7 +906,12 @@ def __str__(self):
             else:
                 result = f"{y}-({m}-{d}){self.month_day_ua}"
         else:
-            result = f"{y}-{m}-{d}" if d else f"{y}-{m}"
+            if d:
+                result = f"{y}-{m}-{d}"
+            elif m:
+                result = f"{y}-{m}"
+            else:
+                result = y
 
         if self.all_ua:
             result = f"({result}){self.all_ua}"

edtf/parser/tests.py

@@ -257,6 +257,18 @@
     ("2011-~06-~04", (False, True, False)),
     ("2004-06-~01/2004-06-~20", (False, True, False)),
     ("156X~", (False, True, False)),
+    ("?1945/1959", (True, False, False)),
+    ("?1945", (True, False, False)),
+    ("?1945-01", (True, False, False)),
+    ("?1945-01-01", (True, False, False)),
+    ("~1945/1959", (False, True, False)),
+    ("~1945", (False, True, False)),
+    ("~1945-01", (False, True, False)),
+    ("~1945-01-01", (False, True, False)),
+    ("%1945/1959", (False, False, True)),
+    ("%1945", (False, False, True)),
+    ("%1945-01", (False, False, True)),
+    ("%1945-01-01", (False, False, True)),
 )
 
 BAD_EXAMPLES = (