Merge lp:~stefanor/ibid/passwords-723405 into lp:ibid

Proposed by Stefano Rivera on 2011-10-30
Status: Merged
Approved by: Max Rabkin on 2011-11-09
Approved revision: 1038
Merged at revision: 1040
Proposed branch: lp:~stefanor/ibid/passwords-723405
Merge into: lp:ibid
Diff against target: 12 lines (+1/-1)
1 file modified
ibid/plugins/codecontest.py (+1/-1)
To merge this branch: bzr merge lp:~stefanor/ibid/passwords-723405
Reviewer Review Type Date Requested Status
Max Rabkin 2011-10-30 Approve on 2011-11-09
Keegan Carruthers-Smith Approve on 2011-10-31
Review via email: mp+80762@code.launchpad.net

Commit message

Allow spaces in USACO passwords

Description of the change

Untested, but looks pretty simple, right? :)

To post a comment you must log in.
review: Approve

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

Max Rabkin (max-rabkin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/codecontest.py'
2--- ibid/plugins/codecontest.py 2010-03-27 15:50:58 +0000
3+++ ibid/plugins/codecontest.py 2011-10-30 20:43:29 +0000
4@@ -193,7 +193,7 @@
5 for type in ['raw', 'deaddressed', 'clean', 'stripped']:
6 event['message'][type] = re.sub(r'(.*)(%s)' % re.escape(term), r'\1[redacted]', event['message'][type])
7
8- @match(r'^(\S+)\s+(?:is|am)\s+(\S+)\s+on\s+usaco(?:\s+password\s+(\S+))?$')
9+ @match(r'^(\S+)\s+(?:is|am)\s+(\S+)\s+on\s+usaco(?:\s+password\s+(.+))?$')
10 def usaco_account(self, event, user, usaco_user, password):
11 if password:
12 self._redact(event, password)

Subscribers

People subscribed via source and target branches

to all changes: