Merge lp:~robru/phablet-tools/trunk into lp:phablet-tools

Proposed by Robert Bruce Park on 2016-11-16
Status: Merged
Approved by: Robert Bruce Park on 2016-11-16
Approved revision: 376
Merged at revision: 374
Proposed branch: lp:~robru/phablet-tools/trunk
Merge into: lp:phablet-tools
Diff against target: 60 lines (+7/-5)
4 files modified
phablet-config (+1/-0)
phabletutils/community.py (+1/-1)
setup.py (+3/-3)
tests/test_static_checkers.py (+2/-1)
To merge this branch: bzr merge lp:~robru/phablet-tools/trunk
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-11-16 Pending
Review via email: mp+311046@code.launchpad.net

Commit message

PEP8 cleanup for zesty.

To post a comment you must log in.
lp:~robru/phablet-tools/trunk updated on 2016-11-16
374. By Robert Bruce Park on 2016-11-16

pep8 fix.

375. By Robert Bruce Park on 2016-11-16

Ignore E305 due to false positive.

376. By Robert Bruce Park on 2016-11-16

pep8 fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phablet-config'
2--- phablet-config 2015-11-17 22:25:46 +0000
3+++ phablet-config 2016-11-16 19:10:32 +0000
4@@ -412,5 +412,6 @@
5 adb.start()
6 args.func(adb, args)
7
8+
9 if __name__ == '__main__':
10 main()
11
12=== modified file 'phabletutils/community.py'
13--- phabletutils/community.py 2013-08-09 01:07:55 +0000
14+++ phabletutils/community.py 2016-11-16 19:10:32 +0000
15@@ -126,4 +126,4 @@
16 return {
17 'md5': hashlib.md5,
18 'sha256': hashlib.sha256,
19- }.get(hash_type, None)
20+ }.get(hash_type, None)
21
22=== modified file 'setup.py'
23--- setup.py 2016-09-02 16:55:10 +0000
24+++ setup.py 2016-11-16 19:10:32 +0000
25@@ -9,7 +9,7 @@
26 'phablet-dev-bootstrap',
27 'phablet-flash',
28 'phablet-config'
29- ]
30+]
31
32 SH_SCRIPTS = [
33 'bileto',
34@@ -20,11 +20,11 @@
35 'click-buddy',
36 'phablet-bootchart',
37 'phablet-shell',
38- ]
39+]
40
41 DATA_FILES = [
42 ('/usr/share/phabletutils/', ['shell-adb-common.sh', ]),
43- ]
44+]
45
46 if __name__ == "__main__":
47 setup(
48
49=== modified file 'tests/test_static_checkers.py'
50--- tests/test_static_checkers.py 2016-06-18 06:24:28 +0000
51+++ tests/test_static_checkers.py 2016-11-16 19:10:32 +0000
52@@ -46,7 +46,8 @@
53
54 @testtools.skipUnless(has_command("pep8"), "pep8 not found")
55 def test_pep8(self):
56- (stdout, stderr) = get_output(['pep8', '.'] + PYTHON_SCRIPTS)
57+ (stdout, stderr) = get_output(
58+ ['pep8', '--ignore=E305', '.'] + PYTHON_SCRIPTS)
59 self.assertEquals('', stdout)
60 self.assertEquals('', stderr)
61

Subscribers

People subscribed via source and target branches