Merge lp:~dholbach/click-reviewers-tools/run-pyflakes3 into lp:click-reviewers-tools

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 436
Proposed branch: lp:~dholbach/click-reviewers-tools/run-pyflakes3
Merge into: lp:click-reviewers-tools
Diff against target: 176 lines (+19/-13)
12 files modified
clickreviews/cr_common.py (+1/-1)
clickreviews/cr_content_hub.py (+1/-1)
clickreviews/cr_desktop.py (+1/-1)
clickreviews/cr_online_accounts.py (+1/-4)
clickreviews/cr_push_helper.py (+1/-1)
clickreviews/cr_scope.py (+1/-1)
clickreviews/cr_systemd.py (+1/-1)
clickreviews/cr_url_dispatcher.py (+1/-1)
clickreviews/tests/test_cr_framework.py (+0/-2)
debian/control (+1/-0)
debian/rules (+1/-0)
run-pyflakes (+9/-0)
To merge this branch: bzr merge lp:~dholbach/click-reviewers-tools/run-pyflakes3
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Canonical Store Reviewers Pending
Review via email: mp+255821@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Awesome!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'clickreviews/cr_common.py'
2--- clickreviews/cr_common.py 2015-04-10 10:36:49 +0000
3+++ clickreviews/cr_common.py 2015-04-10 13:00:11 +0000
4@@ -145,7 +145,7 @@
5 if pkg_yaml is not None:
6 try:
7 self.pkg_yaml = yaml.safe_load(pkg_yaml)
8- except Exception as e:
9+ except Exception:
10 error("Could not load package.yaml. Is it properly formatted?")
11 self._verify_package_yaml_structure()
12 self.is_snap = True
13
14=== modified file 'clickreviews/cr_content_hub.py'
15--- clickreviews/cr_content_hub.py 2015-03-18 19:51:13 +0000
16+++ clickreviews/cr_content_hub.py 2015-04-10 13:00:11 +0000
17@@ -16,7 +16,7 @@
18
19 from __future__ import print_function
20
21-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
22+from clickreviews.cr_common import ClickReview, error, open_file_read
23 import json
24 import os
25
26
27=== modified file 'clickreviews/cr_desktop.py'
28--- clickreviews/cr_desktop.py 2015-04-07 15:09:51 +0000
29+++ clickreviews/cr_desktop.py 2015-04-10 13:00:11 +0000
30@@ -16,7 +16,7 @@
31
32 from __future__ import print_function
33
34-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
35+from clickreviews.cr_common import ClickReview, error, open_file_read
36 import glob
37 import json
38 import os
39
40=== modified file 'clickreviews/cr_online_accounts.py'
41--- clickreviews/cr_online_accounts.py 2015-04-10 12:35:06 +0000
42+++ clickreviews/cr_online_accounts.py 2015-04-10 13:00:11 +0000
43@@ -16,7 +16,7 @@
44
45 from __future__ import print_function
46
47-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
48+from clickreviews.cr_common import ClickReview, error
49 import os
50 # http://lxml.de/tutorial.html
51 import lxml.etree as etree
52@@ -126,7 +126,6 @@
53 t = 'info'
54 n = '%s_%s_id' % (app, account_type)
55 s = "OK"
56- expected_id = "%s_%s" % (self.manifest["name"], app)
57 if "id" in self.accounts[app][account_type].keys():
58 t = 'warn'
59 s = "Found 'id' in application tag"
60@@ -174,7 +173,6 @@
61 t = 'info'
62 n = '%s_%s_id' % (app, account_type)
63 s = "OK"
64- expected_id = "%s_%s" % (self.manifest["name"], app)
65 if "id" in self.accounts[app][account_type].keys():
66 t = 'warn'
67 s = "Found 'id' in service tag"
68@@ -223,7 +221,6 @@
69 t = 'info'
70 n = '%s_%s_id' % (app, account_type)
71 s = "OK"
72- expected_id = "%s_%s" % (self.manifest["name"], app)
73 if "id" in self.accounts[app][account_type].keys():
74 t = 'warn'
75 s = "Found 'id' in provider tag"
76
77=== modified file 'clickreviews/cr_push_helper.py'
78--- clickreviews/cr_push_helper.py 2015-03-18 19:51:13 +0000
79+++ clickreviews/cr_push_helper.py 2015-04-10 13:00:11 +0000
80@@ -16,7 +16,7 @@
81
82 from __future__ import print_function
83
84-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
85+from clickreviews.cr_common import ClickReview, error, open_file_read
86 import json
87 import os
88
89
90=== modified file 'clickreviews/cr_scope.py'
91--- clickreviews/cr_scope.py 2015-03-18 19:51:13 +0000
92+++ clickreviews/cr_scope.py 2015-04-10 13:00:11 +0000
93@@ -16,7 +16,7 @@
94
95 from __future__ import print_function
96
97-from clickreviews.cr_common import ClickReview, error, msg
98+from clickreviews.cr_common import ClickReview, error
99 import codecs
100 import configparser
101 import os
102
103=== modified file 'clickreviews/cr_systemd.py'
104--- clickreviews/cr_systemd.py 2015-04-03 22:17:04 +0000
105+++ clickreviews/cr_systemd.py 2015-04-10 13:00:11 +0000
106@@ -16,7 +16,7 @@
107
108 from __future__ import print_function
109
110-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
111+from clickreviews.cr_common import ClickReview, error, open_file_read
112 import yaml
113 import os
114
115
116=== modified file 'clickreviews/cr_url_dispatcher.py'
117--- clickreviews/cr_url_dispatcher.py 2015-03-18 19:51:13 +0000
118+++ clickreviews/cr_url_dispatcher.py 2015-04-10 13:00:11 +0000
119@@ -16,7 +16,7 @@
120
121 from __future__ import print_function
122
123-from clickreviews.cr_common import ClickReview, error, open_file_read, msg
124+from clickreviews.cr_common import ClickReview, error, open_file_read
125 import json
126 import os
127
128
129=== modified file 'clickreviews/tests/test_cr_framework.py'
130--- clickreviews/tests/test_cr_framework.py 2015-04-03 20:00:32 +0000
131+++ clickreviews/tests/test_cr_framework.py 2015-04-10 13:00:11 +0000
132@@ -13,8 +13,6 @@
133 #
134 # You should have received a copy of the GNU General Public License
135 # along with this program. If not, see <http://www.gnu.org/licenses/>.
136-import sys
137-from io import StringIO
138
139 from clickreviews.cr_framework import ClickReviewFramework
140 import clickreviews.cr_tests as cr_tests
141
142=== modified file 'debian/control'
143--- debian/control 2015-03-04 22:46:47 +0000
144+++ debian/control 2015-04-10 13:00:11 +0000
145@@ -4,6 +4,7 @@
146 Maintainer: Ubuntu Appstore Developers <ubuntu-appstore-developers@lists.launchpad.net>
147 Build-Depends: debhelper (>= 9~),
148 pep8,
149+ pyflakes,
150 python3-all (>= 3.2~),
151 python3-apt,
152 python3-debian,
153
154=== modified file 'debian/rules'
155--- debian/rules 2014-11-11 16:14:12 +0000
156+++ debian/rules 2015-04-10 13:00:11 +0000
157@@ -43,4 +43,5 @@
158 $$python setup.py test; \
159 done
160 ./run-pep8
161+ ./run-pyflakes
162 endif
163
164=== added file 'run-pyflakes'
165--- run-pyflakes 1970-01-01 00:00:00 +0000
166+++ run-pyflakes 2015-04-10 13:00:11 +0000
167@@ -0,0 +1,9 @@
168+#!/bin/sh
169+set -e
170+
171+echo "= pyflakes3 ="
172+for i in ./bin/update-* ./bin/click-check-* ./bin/click-show-files ./bin/click-review \
173+ ./clickreviews/*py ./clickreviews/tests/*py ; do
174+ echo "Checking $i"
175+ pyflakes3 $i
176+done

Subscribers

People subscribed via source and target branches