Merge lp:~gz/brz/lint_E27 into lp:brz

Proposed by Martin Packman on 2018-11-17
Status: Merged
Approved by: Jelmer Vernooij on 2018-11-17
Approved revision: 7187
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~gz/brz/lint_E27
Merge into: lp:brz
Diff against target: 58 lines (+4/-6)
4 files modified
breezy/tests/test_bzrdir.py (+1/-1)
setup.cfg (+0/-2)
tools/fixed-in.py (+2/-2)
tools/win32/brz_postinstall.py (+1/-1)
To merge this branch: bzr merge lp:~gz/brz/lint_E27
Reviewer Review Type Date Requested Status
Jelmer Vernooij 2018-11-17 Approve on 2018-11-17
Review via email: mp+358947@code.launchpad.net

Commit message

Fix E27* lint errors

Description of the change

Fix E27* lint errors

To post a comment you must log in.
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/tests/test_bzrdir.py'
2--- breezy/tests/test_bzrdir.py 2018-11-16 18:33:17 +0000
3+++ breezy/tests/test_bzrdir.py 2018-11-17 17:48:46 +0000
4@@ -60,7 +60,7 @@
5 TestCaseWithTransport,
6 TestSkipped,
7 )
8-from . import(
9+from . import (
10 http_server,
11 http_utils,
12 )
13
14=== modified file 'setup.cfg'
15--- setup.cfg 2018-11-17 17:26:21 +0000
16+++ setup.cfg 2018-11-17 17:48:46 +0000
17@@ -11,8 +11,6 @@
18 E261
19 E265
20 E266
21- E271
22- E275
23 E301
24 E302
25 E303
26
27=== modified file 'tools/fixed-in.py'
28--- tools/fixed-in.py 2018-11-16 11:56:33 +0000
29+++ tools/fixed-in.py 2018-11-17 17:48:46 +0000
30@@ -54,13 +54,13 @@
31 date_re = re.compile(':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'
32 % (self.release,))
33 match = date_re.match(self.lrs)
34- if match is not None:
35+ if match is not None:
36 self.date = match.group(1)
37 return True
38 # The old fashion way
39 released_re = re.compile(':Released:\s+(\d{4}-\d{2}-\d{2})')
40 match = released_re.match(self.lrs)
41- if match is not None:
42+ if match is not None:
43 self.date = match.group(1)
44 return True
45 return False
46
47=== modified file 'tools/win32/brz_postinstall.py'
48--- tools/win32/brz_postinstall.py 2018-11-17 16:53:10 +0000
49+++ tools/win32/brz_postinstall.py 2018-11-17 17:48:46 +0000
50@@ -239,7 +239,7 @@
51 _winreg.SetValueEx(hkey, 'Path', 0, type_, path_u)
52 _winreg.FlushKey(hkey)
53
54- if hkey not is None:
55+ if hkey is not None:
56 _winreg.CloseKey(hkey)
57
58 if (add_path or delete_path) and winver == 'Windows 98':

Subscribers

People subscribed via source and target branches