Breezy

Merge lp:~jelmer/brz/fix-str into lp:brz

  1. fix-str
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: not available
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-str
Merge into: lp:brz
Diff against target: 23 lines (+2/-2)
2 files modified
breezy/info.py (+1/-1)
breezy/patch.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/fix-str
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+372312@code.launchpad.net

Commit message

Fix syntax error in format expansion.

Description of the change

SyntaxWarning: 'str' object is not callable; perhaps you missed a comma?

Proposed in https://github.com/breezy-team/breezy/pull/111

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/info.py'
2--- breezy/info.py 2018-11-28 03:07:45 +0000
3+++ breezy/info.py 2019-09-05 01:53:22 +0000
4@@ -113,7 +113,7 @@
5 if working_path == master_path_base:
6 locs['checkout of co-located branch'] = params['branch']
7 elif 'branch' in params:
8- locs['checkout of branch'] = "%s, branch %s" (
9+ locs['checkout of branch'] = "%s, branch %s" % (
10 master_path_base, params['branch'])
11 else:
12 locs['checkout of branch'] = master_path
13
14=== modified file 'breezy/patch.py'
15--- breezy/patch.py 2019-05-11 09:50:14 +0000
16+++ breezy/patch.py 2019-09-05 01:53:22 +0000
17@@ -62,7 +62,7 @@
18 stdout, stderr = process.communicate(input)
19 status = process.wait()
20 if status < 0:
21- raise Exception("%s killed by signal %i" (args[0], -status))
22+ raise Exception("%s killed by signal %i" % (args[0], -status))
23 return stdout, stderr, status
24
25

Subscribers

People subscribed via source and target branches