Update CDF validator to accept x.com as a valid Twitter URL.

PiperOrigin-RevId: 636856706
google · May 24, 2024 · 0cd6160 · 0cd6160
1 parent c2466ec
commit 0cd6160
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 9 deletions.
diff --git a/rules.py b/rules.py
@@ -2100,7 +2100,8 @@ def check_url(self, uri, annotation, platform):
     parsed_url = urlparse(url)
     # Ensure media platform name is in URL.
     if (platform != "website" and platform not in parsed_url.netloc and
-        not (platform == "facebook" and "fb.com" in parsed_url.netloc)):
+        not (platform == "facebook" and "fb.com" in parsed_url.netloc) and
+        not (platform == "twitter" and "x.com" in parsed_url.netloc)):
       # Note that the URL is encoded for printing purposes
       raise loggers.ElectionError.from_message(
           "Annotation '{}' is incorrect for URI {}.".format(

diff --git a/samples/officeholder_sample_feed.xml b/samples/officeholder_sample_feed.xml
@@ -142,7 +142,7 @@
       </InternationalizedAbbreviation>
       <ContactInformation>
         <Uri Annotation="wikipedia">https://en.wikipedia.org/wiki/Republican_Party_(United_States)</Uri>
-        <Uri Annotation="official-twitter">https://twitter.com/GOP</Uri>
+        <Uri Annotation="official-twitter">https://x.com/GOP</Uri>
       </ContactInformation>
       <ExternalIdentifiers>
         <ExternalIdentifier>
@@ -162,7 +162,7 @@
       </InternationalizedAbbreviation>
       <ContactInformation>
         <Uri Annotation="wikipedia">https://en.wikipedia.org/wiki/Democratic_Party_(United_States)</Uri>
-        <Uri Annotation="official-twitter">https://twitter.com/TheDemocrats</Uri>
+        <Uri Annotation="official-twitter">https://x.com/TheDemocrats</Uri>
       </ContactInformation>
       <ExternalIdentifiers>
         <ExternalIdentifier>
@@ -199,7 +199,7 @@
       </ContactInformation>
       <ContactInformation>
         <Uri Annotation="personal-facebook">https://www.facebook.com/tedcruzpage</Uri>
-        <Uri Annotation="personal-twitter">https://twitter.com/tedcruz</Uri>
+        <Uri Annotation="personal-twitter">https://x.com/tedcruz</Uri>
         <Uri Annotation="personal-website">https://www.tedcruz.org/</Uri>
         <Uri Annotation="wikipedia">https://en.wikipedia.org/wiki/Ted_Cruz</Uri>
       </ContactInformation>
@@ -247,7 +247,7 @@
       <!-- Party leader referenced by party-leader-id. Does not require a linked office. -->
       <ContactInformation>
         <Uri Annotation="personal-facebook">https://www.facebook.com/leaderofparty</Uri>
-        <Uri Annotation="personal-twitter">https://twitter.com/partyleader</Uri>
+        <Uri Annotation="personal-twitter">https://x.com/partyleader</Uri>
         <Uri Annotation="personal-website">https://www.partyleader.org/</Uri>
         <Uri Annotation="wikipedia">https://en.wikipedia.org/wiki/Party_Leader</Uri>
       </ContactInformation>

diff --git a/samples/post_election_sample_feed_precincts.xml b/samples/post_election_sample_feed_precincts.xml
@@ -7810,7 +7810,7 @@
         <Phone annotation="TDD">202-456-6213</Phone>
         <Uri Annotation="official-website">http://www.whitehouse.gov</Uri>
         <Uri Annotation="official-facebook">https://www.facebook.com/WhiteHouse</Uri>
-        <Uri Annotation="official-twitter">https://twitter.com/WhiteHouse</Uri>
+        <Uri Annotation="official-twitter">https://x.com/WhiteHouse</Uri>
       </ContactInformation>
       <ExternalIdentifiers>
         <ExternalIdentifier>

diff --git a/samples/post_election_sample_feed_summary.xml b/samples/post_election_sample_feed_summary.xml
@@ -2156,7 +2156,7 @@
         <Phone annotation="TDD">202-456-6213</Phone>
         <Uri Annotation="official-website">http://www.whitehouse.gov</Uri>
         <Uri Annotation="official-facebook">https://www.facebook.com/WhiteHouse</Uri>
-        <Uri Annotation="official-twitter">https://twitter.com/WhiteHouse</Uri>
+        <Uri Annotation="official-twitter">https://x.com/WhiteHouse</Uri>
       </ContactInformation>
       <ExternalIdentifiers>
         <ExternalIdentifier>

diff --git a/samples/pre_election_sample_feed.xml b/samples/pre_election_sample_feed.xml
@@ -1647,7 +1647,7 @@
         <Phone annotation="TDD">202-456-6213</Phone>
         <Uri Annotation="official-website">http://www.whitehouse.gov</Uri>
         <Uri Annotation="official-facebook">https://www.facebook.com/WhiteHouse</Uri>
-        <Uri Annotation="official-twitter">https://twitter.com/WhiteHouse</Uri>
+        <Uri Annotation="official-twitter">https://x.com/WhiteHouse</Uri>
       </ContactInformation>
       <ExternalIdentifiers>
         <ExternalIdentifier>

diff --git a/tests/rules_test.py b/tests/rules_test.py
@@ -5791,6 +5791,33 @@ def testIncorrectFBAnnotationFails(self):
                      ("'official-fb' is not a valid annotation."))
     self.assertEqual(cm.exception.log_entry[0].elements[0].tag, "Uri")
 
+  def testXAnnotation(self):
+    root_string = """
+      <ContactInformation label="ci_par_at_1">
+        <Uri Annotation="personal-twitter">
+          <![CDATA[https://www.x.com/juanjomalvinas]]>
+        </Uri>
+      </ContactInformation>
+    """
+    self.valid_annotation.check(etree.fromstring(root_string))
+
+  def testIncorrectXAnnotationFails(self):
+    root_string = """
+      <ContactInformation label="ci_par_at_1">
+        <Uri Annotation="official-x">
+          <![CDATA[https://www.x.com]]>
+        </Uri>
+        <Uri Annotation="personal-x">
+          <![CDATA[http://www.twitter.com]]>
+        </Uri>
+      </ContactInformation>
+    """
+    with self.assertRaises(loggers.ElectionWarning) as cm:
+      self.valid_annotation.check(etree.fromstring(root_string))
+    self.assertEqual(cm.exception.log_entry[0].message,
+                     ("'official-x' is not a valid annotation."))
+    self.assertEqual(cm.exception.log_entry[0].elements[0].tag, "Uri")
+
 
 class OfficesHaveJurisdictionIDTest(absltest.TestCase):
 

diff --git a/version.py b/version.py
@@ -5,4 +5,4 @@
 See https://packaging.python.org/guides/single-sourcing-package-version/
 """
 
-__version__ = '1.43.dev7'
+__version__ = '1.43.dev8'