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
=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py 2018-11-16 18:33:17 +0000
+++ breezy/tests/test_bzrdir.py 2018-11-17 17:48:46 +0000
@@ -60,7 +60,7 @@
60 TestCaseWithTransport,60 TestCaseWithTransport,
61 TestSkipped,61 TestSkipped,
62 )62 )
63from . import(63from . import (
64 http_server,64 http_server,
65 http_utils,65 http_utils,
66 )66 )
6767
=== modified file 'setup.cfg'
--- setup.cfg 2018-11-17 17:26:21 +0000
+++ setup.cfg 2018-11-17 17:48:46 +0000
@@ -11,8 +11,6 @@
11 E26111 E261
12 E26512 E265
13 E26613 E266
14 E271
15 E275
16 E30114 E301
17 E30215 E302
18 E30316 E303
1917
=== modified file 'tools/fixed-in.py'
--- tools/fixed-in.py 2018-11-16 11:56:33 +0000
+++ tools/fixed-in.py 2018-11-17 17:48:46 +0000
@@ -54,13 +54,13 @@
54 date_re = re.compile(':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'54 date_re = re.compile(':%s: (NOT RELEASED YET|\d{4}-\d{2}-\d{2})'
55 % (self.release,))55 % (self.release,))
56 match = date_re.match(self.lrs)56 match = date_re.match(self.lrs)
57 if match is not None:57 if match is not None:
58 self.date = match.group(1)58 self.date = match.group(1)
59 return True59 return True
60 # The old fashion way60 # The old fashion way
61 released_re = re.compile(':Released:\s+(\d{4}-\d{2}-\d{2})')61 released_re = re.compile(':Released:\s+(\d{4}-\d{2}-\d{2})')
62 match = released_re.match(self.lrs)62 match = released_re.match(self.lrs)
63 if match is not None:63 if match is not None:
64 self.date = match.group(1)64 self.date = match.group(1)
65 return True65 return True
66 return False66 return False
6767
=== modified file 'tools/win32/brz_postinstall.py'
--- tools/win32/brz_postinstall.py 2018-11-17 16:53:10 +0000
+++ tools/win32/brz_postinstall.py 2018-11-17 17:48:46 +0000
@@ -239,7 +239,7 @@
239 _winreg.SetValueEx(hkey, 'Path', 0, type_, path_u)239 _winreg.SetValueEx(hkey, 'Path', 0, type_, path_u)
240 _winreg.FlushKey(hkey)240 _winreg.FlushKey(hkey)
241241
242 if hkey not is None:242 if hkey is not None:
243 _winreg.CloseKey(hkey)243 _winreg.CloseKey(hkey)
244244
245 if (add_path or delete_path) and winver == 'Windows 98':245 if (add_path or delete_path) and winver == 'Windows 98':

Subscribers

People subscribed via source and target branches