Changeset 57531 in webkit

Timestamp:

Apr 13, 2010 2:28:21 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-13 Eric Seidel <​eric@webkit.org>

Reviewed by David Levin.

the commit-queue hates Tor Arne Vestbø
​https://bugs.webkit.org/show_bug.cgi?id=37511

We were failing to read reviewers out of ChangeLogs
when the reviewer has unicode characters in his/her name.
I fixed this by explicitly decoding from utf8 every time we
read in a ChangeLog file (they are always UTF8).

• Scripts/webkitpy/common/checkout/changelog.py:
• Scripts/webkitpy/common/checkout/changelog_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/changelog.py (modified) (2 diffs)
• Scripts/webkitpy/common/checkout/changelog_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-13  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by David Levin.
+
+        the commit-queue hates Tor Arne Vestbø
+        https://bugs.webkit.org/show_bug.cgi?id=37511
+
+        We were failing to read reviewers out of ChangeLogs
+        when the reviewer has unicode characters in his/her name.
+        I fixed this by explicitly decoding from utf8 every time we
+        read in a ChangeLog file (they are always UTF8).
+
+        * Scripts/webkitpy/common/checkout/changelog.py:
+        * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+
 2010-04-13  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py

@@ -29 +29 @@
 # WebKit's Python module for parsing and modifying ChangeLog files
 
+import codecs
 import fileinput # inplace file editing for set_reviewer_in_changelog
 import os.path
@@ -116 +117 @@
 
     def latest_entry(self):
-        changelog_file = open(self.path)
+        # ChangeLog files are always UTF-8, we read them in as such to support Reviewers with unicode in their names.
+        changelog_file = codecs.open(self.path, "r", "utf-8")
         try:
             return self.parse_latest_entry_from_file(changelog_file)

trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog_unittest.py

@@ -38 +38 @@
 class ChangeLogsTest(unittest.TestCase):
 
-    _example_entry = '''2009-08-17  Peter Kasting  <pkasting@google.com>
+    _example_entry = u'''2009-08-17  Peter Kasting  <pkasting@google.com>
 
-        Reviewed by Steve Falkenburg.
+        Reviewed by Tor Arne Vestb\xf8.
 
         https://bugs.webkit.org/show_bug.cgi?id=27323
@@ -94 +94 @@
         self.assertEquals(latest_entry.author_name(), "Peter Kasting")
         self.assertEquals(latest_entry.author_email(), "pkasting@google.com")
-        self.assertEquals(latest_entry.reviewer_text(), "Steve Falkenburg")
+        self.assertEquals(latest_entry.reviewer_text(), u"Tor Arne Vestb\xf8")
+        self.assertTrue(latest_entry.reviewer())  # Make sure that our UTF8-based lookup of Tor works.
 
     @staticmethod