Title: [123920] trunk/Tools
Revision
123920
Author
[email protected]
Date
2012-07-27 14:56:13 -0700 (Fri, 27 Jul 2012)

Log Message

clean-pending-commit throws exception when encountering Ossy
https://bugs.webkit.org/show_bug.cgi?id=92534

Patch by Eric Seidel <[email protected]> on 2012-07-27
Reviewed by Adam Barth.

Mark a couple strings as unicode so that reviewers with unicode names do not cause
clean-pending-commit to barf.

* Scripts/webkitpy/tool/commands/upload.py:
(CleanPendingCommit._flags_to_clear_on_patch):
(CleanPendingCommit.execute):
(AssignToCommitter._assign_bug_to_last_patch_attacher):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (123919 => 123920)


--- trunk/Tools/ChangeLog	2012-07-27 21:49:36 UTC (rev 123919)
+++ trunk/Tools/ChangeLog	2012-07-27 21:56:13 UTC (rev 123920)
@@ -1,3 +1,18 @@
+2012-07-27  Eric Seidel  <[email protected]>
+
+        clean-pending-commit throws exception when encountering Ossy
+        https://bugs.webkit.org/show_bug.cgi?id=92534
+
+        Reviewed by Adam Barth.
+
+        Mark a couple strings as unicode so that reviewers with unicode names do not cause
+        clean-pending-commit to barf.
+
+        * Scripts/webkitpy/tool/commands/upload.py:
+        (CleanPendingCommit._flags_to_clear_on_patch):
+        (CleanPendingCommit.execute):
+        (AssignToCommitter._assign_bug_to_last_patch_attacher):
+
 2012-07-27  Dirk Pranke  <[email protected]>
 
         chromium win compile broken after removing webkit.py

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/upload.py (123919 => 123920)


--- trunk/Tools/Scripts/webkitpy/tool/commands/upload.py	2012-07-27 21:49:36 UTC (rev 123919)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/upload.py	2012-07-27 21:56:13 UTC (rev 123920)
@@ -74,7 +74,7 @@
         what_was_cleared = []
         if patch.review() == "+":
             if patch.reviewer():
-                what_was_cleared.append("%s's review+" % patch.reviewer().full_name)
+                what_was_cleared.append(u"%s's review+" % patch.reviewer().full_name)
             else:
                 what_was_cleared.append("review+")
         return join_with_separators(what_was_cleared)
@@ -88,7 +88,7 @@
                 flags_to_clear = self._flags_to_clear_on_patch(patch)
                 if not flags_to_clear:
                     continue
-                message = "Cleared %s from obsolete attachment %s so that this bug does not appear in http://webkit.org/pending-commit." % (flags_to_clear, patch.id())
+                message = u"Cleared %s from obsolete attachment %s so that this bug does not appear in http://webkit.org/pending-commit." % (flags_to_clear, patch.id())
                 self._tool.bugs.obsolete_attachment(patch.id(), message)
 
 
@@ -133,7 +133,7 @@
         bug = self._tool.bugs.fetch_bug(bug_id)
         if not bug.is_unassigned():
             assigned_to_email = bug.assigned_to_email()
-            log("Bug %s is already assigned to %s (%s)." % (bug_id, assigned_to_email, committers.committer_by_email(assigned_to_email)))
+            log(u"Bug %s is already assigned to %s (%s)." % (bug_id, assigned_to_email, committers.committer_by_email(assigned_to_email)))
             return
 
         reviewed_patches = bug.reviewed_patches()
@@ -153,7 +153,7 @@
             log("Attacher %s is not a committer.  Bug %s likely needs commit-queue+." % (attacher_email, bug_id))
             return
 
-        reassign_message = "Attachment %s was posted by a committer and has review+, assigning to %s for commit." % (latest_patch.id(), committer.full_name)
+        reassign_message = u"Attachment %s was posted by a committer and has review+, assigning to %s for commit." % (latest_patch.id(), committer.full_name)
         self._tool.bugs.reassign_bug(bug_id, committer.bugzilla_email(), reassign_message)
 
     def execute(self, options, args, tool):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to