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

[Nicholas Skaggs]

Fixes for new pep8 requirements

Fixes for new pep8 requirements

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:82
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/65/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/692
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/9

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/65/rebuild

review: Approve (continuous-integration)

[Julia Palandri (julia-palandri)]

LGTM

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

review: Approve

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2014-05-06 18:52:40 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2014-06-27 15:15:20 +0000
@@ -84,6 +84,7 @@
 
 
 class DbMan(object):
+
     """
     Helper functions for dealing with sqlite databases
     """
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-06-16 10:38:24 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-06-27 15:15:20 +0000
@@ -72,7 +72,7 @@
         for ritem in items:
             if ritem.text == value:
                 self.pointing_device.click_object(ritem)
-                #the first label is always the "color scheme"
+                # the first label is always the "color scheme"
                 itemLabel = lambda: ritem.text
                 self.assertThat(itemLabel, Eventually(Equals(value)))
 
@@ -126,11 +126,11 @@
         tap_x = (x + w) / 2
         tap_y = (y + h) / 3
 
-        #tap in the top third of the screen, to avoid OSK
+        # tap in the top third of the screen, to avoid OSK
         self.pointing_device.move(tap_x, tap_y)
         self.pointing_device.press()
-        #we can hold the press for a long time without issue
-        #so we'll ensure the app recieves our signal when under load
+        # we can hold the press for a long time without issue
+        # so we'll ensure the app recieves our signal when under load
         sleep(4)
         self.pointing_device.release()
 
@@ -152,8 +152,8 @@
         kterm = self.main_view.get_kterm()
         self.main_view.switch_to_tab("SettingsTab")
 
-        #are these string translatable?
-        #if so, we need to do this another way
+        # are these string translatable?
+        # if so, we need to do this another way
         schemeList = ("DarkPastels",
                       "Linux",
                       "BlackOnRandomLight",
@@ -181,13 +181,13 @@
         font_size = self.get_font_size_from_storage()
         self.assertThat(font_size, Equals(32))
 
-        ## change font size to min
+        # change font size to min
         self.main_view.drag_horizontal_slider("slFont", 8)
         sleep(1)
         font_size = self.get_font_size_from_storage()
         self.assertThat(font_size, Equals(8))
 
-        ## change font size to random sizes
+        # change font size to random sizes
         for loop in range(1, 3):
             randSize = random.randrange(8, 32, 1)
             self.main_view.drag_horizontal_slider("slFont", randSize)