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

Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
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 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
374. By Robert Bruce Park

pep8 fix.

375. By Robert Bruce Park

Ignore E305 due to false positive.

376. By Robert Bruce Park

pep8 fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'phablet-config'
--- phablet-config 2015-11-17 22:25:46 +0000
+++ phablet-config 2016-11-16 19:10:32 +0000
@@ -412,5 +412,6 @@
412 adb.start()412 adb.start()
413 args.func(adb, args)413 args.func(adb, args)
414414
415
415if __name__ == '__main__':416if __name__ == '__main__':
416 main()417 main()
417418
=== modified file 'phabletutils/community.py'
--- phabletutils/community.py 2013-08-09 01:07:55 +0000
+++ phabletutils/community.py 2016-11-16 19:10:32 +0000
@@ -126,4 +126,4 @@
126 return {126 return {
127 'md5': hashlib.md5,127 'md5': hashlib.md5,
128 'sha256': hashlib.sha256,128 'sha256': hashlib.sha256,
129 }.get(hash_type, None)129 }.get(hash_type, None)
130130
=== modified file 'setup.py'
--- setup.py 2016-09-02 16:55:10 +0000
+++ setup.py 2016-11-16 19:10:32 +0000
@@ -9,7 +9,7 @@
9 'phablet-dev-bootstrap',9 'phablet-dev-bootstrap',
10 'phablet-flash',10 'phablet-flash',
11 'phablet-config'11 'phablet-config'
12 ]12]
1313
14SH_SCRIPTS = [14SH_SCRIPTS = [
15 'bileto',15 'bileto',
@@ -20,11 +20,11 @@
20 'click-buddy',20 'click-buddy',
21 'phablet-bootchart',21 'phablet-bootchart',
22 'phablet-shell',22 'phablet-shell',
23 ]23]
2424
25DATA_FILES = [25DATA_FILES = [
26 ('/usr/share/phabletutils/', ['shell-adb-common.sh', ]),26 ('/usr/share/phabletutils/', ['shell-adb-common.sh', ]),
27 ]27]
2828
29if __name__ == "__main__":29if __name__ == "__main__":
30 setup(30 setup(
3131
=== modified file 'tests/test_static_checkers.py'
--- tests/test_static_checkers.py 2016-06-18 06:24:28 +0000
+++ tests/test_static_checkers.py 2016-11-16 19:10:32 +0000
@@ -46,7 +46,8 @@
4646
47 @testtools.skipUnless(has_command("pep8"), "pep8 not found")47 @testtools.skipUnless(has_command("pep8"), "pep8 not found")
48 def test_pep8(self):48 def test_pep8(self):
49 (stdout, stderr) = get_output(['pep8', '.'] + PYTHON_SCRIPTS)49 (stdout, stderr) = get_output(
50 ['pep8', '--ignore=E305', '.'] + PYTHON_SCRIPTS)
50 self.assertEquals('', stdout)51 self.assertEquals('', stdout)
51 self.assertEquals('', stderr)52 self.assertEquals('', stderr)
5253

Subscribers

People subscribed via source and target branches