civics-cdf-validator 1.61.dev3__tar.gz → 1.61.dev5__tar.gz

{civics_cdf_validator-1.61.dev3/civics_cdf_validator.egg-info → civics_cdf_validator-1.61.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.61.dev3
+Version: 1.61.dev5
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.61.dev3 → civics_cdf_validator-1.61.dev5/civics_cdf_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: civics_cdf_validator
-Version: 1.61.dev3
+Version: 1.61.dev5
 Summary: Checks if an election feed follows best practices
 Home-page: https://github.com/google/civics_cdf_validator
 Author: Google Civics

{civics_cdf_validator-1.61.dev3 → civics_cdf_validator-1.61.dev5}/rules.py

@@ -141,6 +141,13 @@ _WINNER_POST_ELECTION_STATUSES = frozenset([
 ])
 
 
+def _is_xml_true(element):
+  return (
+      element_has_text(element)
+      and element.text.strip().lower() in _XML_TRUE_VALUES
+  )
+
+
 def _get_office_roles(element, is_post_office_split_feed=False):
   if is_post_office_split_feed:
     return [element.text for element in element.findall("Role")]
@@ -408,10 +415,10 @@ class HungarianStyleNotation(base.BaseRule):
 
 
 class LanguageCode(base.BaseRule):
-  """Check that Text elements have a valid language code."""
+  """Check that Text and Uri elements have a valid language code."""
 
   def elements(self):
-    return ["Text"]
+    return ["Text", "Uri"]
 
   def check(self, element):
     if "language" not in element.attrib:
@@ -4716,6 +4723,10 @@ class FeedInactiveDateIsLatestDate(base.BaseRule):
     return ["Feed"]
 
   def check(self, element):
+    # Skip this rule for test feeds.
+    if _is_xml_true(element.find("IsTest")):
+      return
+
     if element_has_text(element.find("FeedInactiveDate")):
       feed_inactive_date = base.PartialDate.init_partial_date(
           element.find("FeedInactiveDate").text
@@ -5404,11 +5415,7 @@ class ValidateIncludeInAggregationBallotSelections(base.BaseRule):
 
     included_selections = []
     for selection in all_selections:
-      included_in_aggregation_element = selection.find("IncludedInAggregation")
-      if (
-          element_has_text(included_in_aggregation_element)
-          and included_in_aggregation_element.text in _XML_TRUE_VALUES
-      ):
+      if _is_xml_true(selection.find("IncludedInAggregation")):
         included_selections.append(selection)
     if not included_selections:
       return

{civics_cdf_validator-1.61.dev3 → civics_cdf_validator-1.61.dev5}/version.py

@@ -5,4 +5,4 @@ No dependencies should be added to this module.
 See https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
-__version__ = '1.61.dev3'
+__version__ = '1.61.dev5'