Merge lp:~nskaggs/ubuntu-terminal-app/new-pep8-fixes into lp:ubuntu-terminal-app

Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 82
Merged at revision: 82
Proposed branch: lp:~nskaggs/ubuntu-terminal-app/new-pep8-fixes
Merge into: lp:ubuntu-terminal-app
Diff against target: 66 lines (+9/-8)
2 files modified
tests/autopilot/ubuntu_terminal_app/tests/__init__.py (+1/-0)
tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py (+8/-8)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-terminal-app/new-pep8-fixes
Reviewer Review Type Date Requested Status
Julia Palandri (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+224856@code.launchpad.net

Commit message

Fixes for new pep8 requirements

Description of the change

Fixes for new pep8 requirements

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Julia Palandri (julia-palandri) wrote :

LGTM

line 46 could be s/string/strings, but nothing serious

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
2--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py 2014-05-06 18:52:40 +0000
3+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py 2014-06-27 15:15:20 +0000
4@@ -84,6 +84,7 @@
5
6
7 class DbMan(object):
8+
9 """
10 Helper functions for dealing with sqlite databases
11 """
12
13=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
14--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-16 10:38:24 +0000
15+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py 2014-06-27 15:15:20 +0000
16@@ -72,7 +72,7 @@
17 for ritem in items:
18 if ritem.text == value:
19 self.pointing_device.click_object(ritem)
20- #the first label is always the "color scheme"
21+ # the first label is always the "color scheme"
22 itemLabel = lambda: ritem.text
23 self.assertThat(itemLabel, Eventually(Equals(value)))
24
25@@ -126,11 +126,11 @@
26 tap_x = (x + w) / 2
27 tap_y = (y + h) / 3
28
29- #tap in the top third of the screen, to avoid OSK
30+ # tap in the top third of the screen, to avoid OSK
31 self.pointing_device.move(tap_x, tap_y)
32 self.pointing_device.press()
33- #we can hold the press for a long time without issue
34- #so we'll ensure the app recieves our signal when under load
35+ # we can hold the press for a long time without issue
36+ # so we'll ensure the app recieves our signal when under load
37 sleep(4)
38 self.pointing_device.release()
39
40@@ -152,8 +152,8 @@
41 kterm = self.main_view.get_kterm()
42 self.main_view.switch_to_tab("SettingsTab")
43
44- #are these string translatable?
45- #if so, we need to do this another way
46+ # are these string translatable?
47+ # if so, we need to do this another way
48 schemeList = ("DarkPastels",
49 "Linux",
50 "BlackOnRandomLight",
51@@ -181,13 +181,13 @@
52 font_size = self.get_font_size_from_storage()
53 self.assertThat(font_size, Equals(32))
54
55- ## change font size to min
56+ # change font size to min
57 self.main_view.drag_horizontal_slider("slFont", 8)
58 sleep(1)
59 font_size = self.get_font_size_from_storage()
60 self.assertThat(font_size, Equals(8))
61
62- ## change font size to random sizes
63+ # change font size to random sizes
64 for loop in range(1, 3):
65 randSize = random.randrange(8, 32, 1)
66 self.main_view.drag_horizontal_slider("slFont", randSize)

Subscribers

People subscribed via source and target branches