Merge lp:~elopio/dropping-letters/fix1205217 into lp:dropping-letters

Proposed by Leo Arias
Status: Merged
Approved by: Ken VanDine
Approved revision: 34
Merged at revision: 34
Proposed branch: lp:~elopio/dropping-letters/fix1205217
Merge into: lp:dropping-letters
Diff against target: 102 lines (+19/-9)
5 files modified
convert_wordlist_to_bindict.py (+6/-3)
tests/autopilot/dropping_letters_app/emulators/main_window.py (+2/-1)
tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py (+7/-3)
tests/autopilot/dropping_letters_app/tests/__init__.py (+2/-1)
tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py (+2/-1)
To merge this branch: bzr merge lp:~elopio/dropping-letters/fix1205217
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+177099@code.launchpad.net

Commit message

Fixed pep8 errors.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'convert_wordlist_to_bindict.py'
2--- convert_wordlist_to_bindict.py 2012-12-07 02:12:01 +0000
3+++ convert_wordlist_to_bindict.py 2013-07-26 07:34:29 +0000
4@@ -1,14 +1,17 @@
5 import json
6+
7+
8 fp = open("wordlist.txt")
9 d = {}
10 for line in fp.readlines():
11 l = line.strip()
12- if len(l) not in d: d[len(l)] = []
13+ if len(l) not in d:
14+ d[len(l)] = []
15 d[len(l)].append(l)
16
17 m = max(d.keys())
18-o = ["","",""] # no zero, one, or two letter words
19-for i in range(3,m+1):
20+o = ["", "", ""] # no zero, one, or two letter words
21+for i in range(3, m + 1):
22 s = d.get(i, [])
23 s.sort()
24 o.append("".join(s))
25
26=== modified file 'tests/autopilot/dropping_letters_app/emulators/main_window.py'
27--- tests/autopilot/dropping_letters_app/emulators/main_window.py 2013-07-14 10:54:45 +0000
28+++ tests/autopilot/dropping_letters_app/emulators/main_window.py 2013-07-26 07:34:29 +0000
29@@ -19,7 +19,8 @@
30
31
32 class MainWindow(object):
33- """An emulator class that makes it easy to interact with the Dropping Letters app."""
34+ """An emulator class that makes it easy to interact with the Dropping
35+ Letters app."""
36
37 def __init__(self, app):
38 self.app = app
39
40=== modified file 'tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py'
41--- tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py 2013-07-10 18:26:02 +0000
42+++ tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py 2013-07-26 07:34:29 +0000
43@@ -19,8 +19,10 @@
44 from testtools.matchers import Equals, NotEquals, Not, Is
45 from autopilot.matchers import Eventually
46
47+
48 class ubuntusdk(object):
49- """An emulator class that makes it easy to interact with the ubuntu sdk applications."""
50+ """An emulator class that makes it easy to interact with the ubuntu sdk
51+ applications."""
52
53 def __init__(self, autopilot, app):
54 self.app = app
55@@ -109,7 +111,8 @@
56 def set_popup_value(self, popover, button, value):
57 """Changes the given popover selector to the request value
58 At the moment this only works for values that are currently visible. To
59- access the remaining items, a help method to drag and recheck is needed."""
60+ access the remaining items, a help method to drag and recheck is
61+ needed."""
62 #The popover is assumed to be the following format
63 # Popover {
64 # Column {
65@@ -119,7 +122,8 @@
66 # text: value
67
68 self.autopilot.pointing_device.click_object(button)
69- #we'll get all matching objects, incase the popover is reused between buttons
70+ #we'll get all matching objects, incase the popover is reused between
71+ # buttons
72 itemList = lambda: self.get_objects("Standard", popover)
73
74 for item in itemList():
75
76=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
77--- tests/autopilot/dropping_letters_app/tests/__init__.py 2013-07-14 10:54:45 +0000
78+++ tests/autopilot/dropping_letters_app/tests/__init__.py 2013-07-26 07:34:29 +0000
79@@ -50,7 +50,8 @@
80 self.app = self.launch_test_application(
81 "qmlscene",
82 "/usr/share/dropping-letters/dropping-letters.qml",
83- "--desktop_file_hint=/usr/share/applications/dropping-letters.desktop",
84+ "--desktop_file_hint=/usr/share/applications/"
85+ "dropping-letters.desktop",
86 app_type='qt')
87
88 @property
89
90=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
91--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2013-07-14 10:54:45 +0000
92+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2013-07-26 07:34:29 +0000
93@@ -19,7 +19,8 @@
94
95 def setUp(self):
96 super(TestMainWindow, self).setUp()
97- self.assertThat(self.main_window.get_qml_view().visible, Eventually(Equals(True)))
98+ self.assertThat(
99+ self.main_window.get_qml_view().visible, Eventually(Equals(True)))
100
101 def tearDown(self):
102 super(TestMainWindow, self).tearDown()

Subscribers

People subscribed via source and target branches