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
=== modified file 'convert_wordlist_to_bindict.py'
--- convert_wordlist_to_bindict.py 2012-12-07 02:12:01 +0000
+++ convert_wordlist_to_bindict.py 2013-07-26 07:34:29 +0000
@@ -1,14 +1,17 @@
1import json1import json
2
3
2fp = open("wordlist.txt")4fp = open("wordlist.txt")
3d = {}5d = {}
4for line in fp.readlines():6for line in fp.readlines():
5 l = line.strip()7 l = line.strip()
6 if len(l) not in d: d[len(l)] = []8 if len(l) not in d:
9 d[len(l)] = []
7 d[len(l)].append(l)10 d[len(l)].append(l)
811
9m = max(d.keys())12m = max(d.keys())
10o = ["","",""] # no zero, one, or two letter words13o = ["", "", ""] # no zero, one, or two letter words
11for i in range(3,m+1):14for i in range(3, m + 1):
12 s = d.get(i, [])15 s = d.get(i, [])
13 s.sort()16 s.sort()
14 o.append("".join(s))17 o.append("".join(s))
1518
=== modified file 'tests/autopilot/dropping_letters_app/emulators/main_window.py'
--- tests/autopilot/dropping_letters_app/emulators/main_window.py 2013-07-14 10:54:45 +0000
+++ tests/autopilot/dropping_letters_app/emulators/main_window.py 2013-07-26 07:34:29 +0000
@@ -19,7 +19,8 @@
1919
2020
21class MainWindow(object):21class MainWindow(object):
22 """An emulator class that makes it easy to interact with the Dropping Letters app."""22 """An emulator class that makes it easy to interact with the Dropping
23 Letters app."""
2324
24 def __init__(self, app):25 def __init__(self, app):
25 self.app = app26 self.app = app
2627
=== modified file 'tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py'
--- tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py 2013-07-10 18:26:02 +0000
+++ tests/autopilot/dropping_letters_app/emulators/ubuntusdk.py 2013-07-26 07:34:29 +0000
@@ -19,8 +19,10 @@
19from testtools.matchers import Equals, NotEquals, Not, Is19from testtools.matchers import Equals, NotEquals, Not, Is
20from autopilot.matchers import Eventually20from autopilot.matchers import Eventually
2121
22
22class ubuntusdk(object):23class ubuntusdk(object):
23 """An emulator class that makes it easy to interact with the ubuntu sdk applications."""24 """An emulator class that makes it easy to interact with the ubuntu sdk
25 applications."""
2426
25 def __init__(self, autopilot, app):27 def __init__(self, autopilot, app):
26 self.app = app28 self.app = app
@@ -109,7 +111,8 @@
109 def set_popup_value(self, popover, button, value):111 def set_popup_value(self, popover, button, value):
110 """Changes the given popover selector to the request value112 """Changes the given popover selector to the request value
111 At the moment this only works for values that are currently visible. To113 At the moment this only works for values that are currently visible. To
112 access the remaining items, a help method to drag and recheck is needed."""114 access the remaining items, a help method to drag and recheck is
115 needed."""
113 #The popover is assumed to be the following format116 #The popover is assumed to be the following format
114 # Popover {117 # Popover {
115 # Column {118 # Column {
@@ -119,7 +122,8 @@
119 # text: value122 # text: value
120123
121 self.autopilot.pointing_device.click_object(button)124 self.autopilot.pointing_device.click_object(button)
122 #we'll get all matching objects, incase the popover is reused between buttons125 #we'll get all matching objects, incase the popover is reused between
126 # buttons
123 itemList = lambda: self.get_objects("Standard", popover)127 itemList = lambda: self.get_objects("Standard", popover)
124128
125 for item in itemList():129 for item in itemList():
126130
=== modified file 'tests/autopilot/dropping_letters_app/tests/__init__.py'
--- tests/autopilot/dropping_letters_app/tests/__init__.py 2013-07-14 10:54:45 +0000
+++ tests/autopilot/dropping_letters_app/tests/__init__.py 2013-07-26 07:34:29 +0000
@@ -50,7 +50,8 @@
50 self.app = self.launch_test_application(50 self.app = self.launch_test_application(
51 "qmlscene",51 "qmlscene",
52 "/usr/share/dropping-letters/dropping-letters.qml",52 "/usr/share/dropping-letters/dropping-letters.qml",
53 "--desktop_file_hint=/usr/share/applications/dropping-letters.desktop",53 "--desktop_file_hint=/usr/share/applications/"
54 "dropping-letters.desktop",
54 app_type='qt')55 app_type='qt')
5556
56 @property57 @property
5758
=== modified file 'tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py'
--- tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2013-07-14 10:54:45 +0000
+++ tests/autopilot/dropping_letters_app/tests/test_dropping_letters.py 2013-07-26 07:34:29 +0000
@@ -19,7 +19,8 @@
1919
20 def setUp(self):20 def setUp(self):
21 super(TestMainWindow, self).setUp()21 super(TestMainWindow, self).setUp()
22 self.assertThat(self.main_window.get_qml_view().visible, Eventually(Equals(True)))22 self.assertThat(
23 self.main_window.get_qml_view().visible, Eventually(Equals(True)))
2324
24 def tearDown(self):25 def tearDown(self):
25 super(TestMainWindow, self).tearDown()26 super(TestMainWindow, self).tearDown()

Subscribers

People subscribed via source and target branches