third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py - Issue 2014063002: Run format-webkit on webkitpy code (without string conversion).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py

Issue 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/style/optparser.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/command.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py

index 8df9d0b3a4b662916771830e6471adfb3b5ab8cc..b3d2d038d344979d803242920e2b16e752d02197 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/bot/commitannouncer.py

@@ -110,7 +110,7 @@ class CommitAnnouncer(SingleServerIRCBot):

return False

try:

self.git.ensure_cleanly_tracking_remote_master()

- except ScriptError, e:

+ except ScriptError as e:

_log.error('Failed to clean repository: %s' % e)

return False

@@ -130,7 +130,7 @@ class CommitAnnouncer(SingleServerIRCBot):

try:

self.git.pull()

return True

- except ScriptError, e:

+ except ScriptError as e:

_log.error('Error pulling from server: %s' % e)

_log.error('Output: %s' % e.output)

attempts += 1