Launchpad itself

Merge ~twom/launchpad:lint-e632 into launchpad:master

  1. Git
  2. lp:~twom/launchpad
  3. lint-e632
  4. Merge into master
Proposed by Tom Wardill
Status: Merged
Approved by: Tom Wardill
Approved revision: 7e10a33469a063fe74552c8c367ab34d0fefb741
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~twom/launchpad:lint-e632
Merge into: launchpad:master
Diff against target: 48 lines (+4/-4)
3 files modified
lib/lp/blueprints/mail/notifications.py (+1/-1)
lib/lp/soyuz/browser/packagerelationship.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py (+2/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+406645@code.launchpad.net

Commit message

Remove F632 violations

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/blueprints/mail/notifications.py b/lib/lp/blueprints/mail/notifications.py
2index f651520..be0b573 100644
3--- a/lib/lp/blueprints/mail/notifications.py
4+++ b/lib/lp/blueprints/mail/notifications.py
5@@ -84,7 +84,7 @@ def notify_specification_modified(spec, event):
6 if info_lines:
7 info_lines.append('')
8 workitems_delta = spec_delta.workitems_text
9- if workitems_delta['old'] is '':
10+ if workitems_delta['old'] == '':
11 info_lines.append('Work items set to:')
12 info_lines.append(mail_wrapper.format(workitems_delta['new']))
13 else:
14diff --git a/lib/lp/soyuz/browser/packagerelationship.py b/lib/lp/soyuz/browser/packagerelationship.py
15index a73a0db..e1d4034 100644
16--- a/lib/lp/soyuz/browser/packagerelationship.py
17+++ b/lib/lp/soyuz/browser/packagerelationship.py
18@@ -83,7 +83,7 @@ class PackageRelationshipSet:
19
20 def has_items(self):
21 """See IPackageRelationshipSet."""
22- return len(self.contents) is not 0
23+ return len(self.contents) != 0
24
25 def __iter__(self):
26 return iter(sorted(
27diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
28index e86a857..2920c84 100644
29--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
30+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
31@@ -115,7 +115,7 @@ class InitializationHelperTestCase(TestCaseWithFactory):
32 distroseries=parent,
33 pocket=pocket, status=PackagePublishingStatus.PUBLISHED)
34 status = BuildStatus.FULLYBUILT
35- if package is 'chromium':
36+ if package == 'chromium':
37 status = BuildStatus.FAILEDTOBUILD
38 bpn = self.factory.getOrMakeBinaryPackageName(package)
39 build = self.factory.makeBinaryPackageBuild(
40@@ -125,7 +125,7 @@ class InitializationHelperTestCase(TestCaseWithFactory):
41 bpr = self.factory.makeBinaryPackageRelease(
42 binarypackagename=bpn, build=build,
43 version=packages[package])
44- if package is not 'chromium':
45+ if package != 'chromium':
46 self.factory.makeBinaryPackagePublishingHistory(
47 binarypackagerelease=bpr,
48 distroarchseries=parent_das,

Subscribers

People subscribed via source and target branches

to status/vote changes: