Merge lp:~elopio/autopilot/fix1201057-pep8-3 into lp:autopilot

[Leo Arias]

Fixed pep8 errors in autopilto/vis and autopilot/display.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:281
http://jenkins.qa.ubuntu.com/job/autopilot-ci/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/85

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/157/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'autopilot/display/_X11.py'
--- autopilot/display/_X11.py	2013-05-02 15:59:26 +0000
+++ autopilot/display/_X11.py	2013-07-14 08:34:30 +0000
@@ -24,16 +24,19 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Display(DisplayBase):
     def __init__(self):
-        # Note: MUST import these here, rather than at the top of the file. Why?
-        # Because sphinx imports these modules to build the API documentation,
-        # which in turn tries to import Gdk, which in turn fails because there's
-        # no DISPlAY environment set in the package builder.
+        # Note: MUST import these here, rather than at the top of the file.
+        # Why? Because sphinx imports these modules to build the API
+        # documentation, which in turn tries to import Gdk, which in turn
+        # fails because there's no DISPlAY environment set in the package
+        # builder.
         from gi.repository import Gdk
         self._default_screen = Gdk.Screen.get_default()
         if self._default_screen is None:
-            raise RuntimeError("Unable to determine default screen information")
+            raise RuntimeError(
+                "Unable to determine default screen information")
         self._blacklisted_drivers = ["NVIDIA"]
 
     def get_num_screens(self):

=== modified file 'autopilot/display/__init__.py'
--- autopilot/display/__init__.py	2013-04-23 04:15:54 +0000
+++ autopilot/display/__init__.py	2013-07-14 08:34:30 +0000
@@ -26,7 +26,8 @@
 
 
 def is_rect_on_screen(screen_number, rect):
-    """Returns True if *rect* is **entirely** on the specified screen, with no overlap."""
+    """Returns True if *rect* is **entirely** on the specified screen, with no
+    overlap."""
     (x, y, w, h) = rect
     (mx, my, mw, mh) = Display.create().get_screen_geometry(screen_number)
     return (x >= mx and x + w <= mx + mw and y >= my and y + h <= my + mh)
@@ -45,7 +46,8 @@
 
 def is_point_on_any_screen(point):
     """Returns true if *point* is on any currently configured screen."""
-    return any([is_point_on_screen(m, point) for m in range(Display.create().get_num_screens())])
+    return any([is_point_on_screen(m, point) for m in
+                range(Display.create().get_num_screens())])
 
 
 def move_mouse_to_screen(screen_number):
@@ -70,7 +72,8 @@
 #         raise TypeError("Window must be a BamfWindow")
 
 #     if window.monitor == screen:
-#         logger.debug("Window %r is already on screen %d." % (window.x_id, screen))
+#         logger.debug(
+#             "Window %r is already on screen %d." % (window.x_id, screen))
 #         return
 
 #     assert(not window.is_maximized)
@@ -102,21 +105,22 @@
     def create(preferred_backend=''):
         """Get an instance of the Display class.
 
-        For more infomration on picking specific backends, see :ref:`tut-picking-backends`
+        For more infomration on picking specific backends, see
+        :ref:`tut-picking-backends`
 
-        :param preferred_backend: A string containing a hint as to which backend you
-            would like.
+        :param preferred_backend: A string containing a hint as to which
+            backend you would like.
 
             possible backends are:
 
             * ``X11`` - Get display information from X11.
             * ``UPA`` - Get display information from the ubuntu platform API.
-        :raises: RuntimeError if autopilot cannot instantate any of the possible
-            backends.
+        :raises: RuntimeError if autopilot cannot instantate any of the
+            possible backends.
         :raises: RuntimeError if the preferred_backend is specified and is not
             one of the possible backends for this device class.
-        :raises: :class:`~autopilot.BackendException` if the preferred_backend is
-            set, but that backend could not be instantiated.
+        :raises: :class:`~autopilot.BackendException` if the preferred_backend
+            is set, but that backend could not be instantiated.
 
         """
         def get_x11_display():
@@ -133,7 +137,8 @@
         return _pick_backend(backends, preferred_backend)
 
     class BlacklistedDriverError(RuntimeError):
-        """Cannot set primary monitor when running drivers listed in the driver blacklist."""
+        """Cannot set primary monitor when running drivers listed in the
+        driver blacklist."""
 
     def get_num_screens(self):
         """Get the number of screens attached to the PC."""

=== modified file 'autopilot/display/_upa.py'
--- autopilot/display/_upa.py	2013-04-23 04:15:54 +0000
+++ autopilot/display/_upa.py	2013-07-14 08:34:30 +0000
@@ -25,6 +25,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class Display(DisplayBase):
     """The base class/inteface for the display devices"""
 

=== modified file 'autopilot/vis/__init__.py'
--- autopilot/vis/__init__.py	2013-06-25 23:10:27 +0000
+++ autopilot/vis/__init__.py	2013-07-14 08:34:30 +0000
@@ -26,6 +26,7 @@
 from autopilot.vis.bus_enumerator import BusEnumerator
 from autopilot.vis.main_window import MainWindow
 
+
 def vis_main():
     app = QtGui.QApplication(sys.argv)
     app.setApplicationName("Autopilot")
@@ -42,4 +43,3 @@
 
     window.show()
     sys.exit(app.exec_())
-

=== modified file 'autopilot/vis/bus_enumerator.py'
--- autopilot/vis/bus_enumerator.py	2013-04-23 04:15:54 +0000
+++ autopilot/vis/bus_enumerator.py	2013-07-14 08:34:30 +0000
@@ -25,7 +25,7 @@
     pyqtSignal,
     qDebug,
     QObject,
-    )
+)
 from xml.etree import ElementTree
 
 
@@ -51,12 +51,12 @@
             self._get_objects_and_interfaces(connection)
 
     def _get_objects_and_interfaces(self, conn_name, obj_name='/'):
-        """Return a list of objects and their interfaces.
-
-        """
+        """Return a list of objects and their interfaces."""
         obj = self._bus.get_object(conn_name, obj_name)
-        obj.Introspect(dbus_interface='org.freedesktop.DBus.Introspectable',
-            reply_handler=lambda xml: self._reply_handler(conn_name, obj_name, xml),
+        obj.Introspect(
+            dbus_interface='org.freedesktop.DBus.Introspectable',
+            reply_handler=lambda xml: self._reply_handler(
+                conn_name, obj_name, xml),
             error_handler=self._error_handler)
 
     def _error_handler(self, *error):
@@ -68,9 +68,7 @@
         for child in root.getchildren():
             child_name = join(obj_name, child.attrib['name'])
             if child.tag == 'node':
-                self._get_objects_and_interfaces(
-                                                conn_name,
-                                                child_name)
+                self._get_objects_and_interfaces(conn_name, child_name)
             elif child.tag == 'interface':
                 iface_name = child_name.split('/')[-1]
                 self._add_hit(conn_name, obj_name, iface_name)
@@ -103,7 +101,7 @@
         if connection_string not in self._data.keys():
             raise KeyError("connection %s not in results" % connection_string)
         if object_path not in self._data[connection_string].keys():
-            raise KeyError("object %s not in results for connection %s" % (object_path, connection_string))
+            raise KeyError(
+                "object %s not in results for connection %s" %
+                (object_path, connection_string))
         return self._data[connection_string][object_path]
-
-

=== modified file 'autopilot/vis/main_window.py'
--- autopilot/vis/main_window.py	2013-06-25 23:10:27 +0000
+++ autopilot/vis/main_window.py	2013-07-14 08:34:30 +0000
@@ -23,7 +23,10 @@
 import dbus
 from PyQt4 import QtGui, QtCore
 
-from autopilot.introspection import _get_dbus_address_object, _make_proxy_object
+from autopilot.introspection import (
+    _get_dbus_address_object,
+    _make_proxy_object
+)
 from autopilot.introspection.constants import AP_INTROSPECTION_IFACE
 from autopilot.introspection.dbus import StateNotFoundError
 from autopilot.introspection.qt import QtObjectProxyMixin
@@ -41,8 +44,8 @@
 
     def readSettings(self):
         settings = QtCore.QSettings()
-        self.restoreGeometry(settings.value("geometry").toByteArray());
-        self.restoreState(settings.value("windowState").toByteArray());
+        self.restoreGeometry(settings.value("geometry").toByteArray())
+        self.restoreState(settings.value("windowState").toByteArray())
 
     def closeEvent(self, event):
         settings = QtCore.QSettings()
@@ -61,7 +64,8 @@
         self.setCentralWidget(self.splitter)
 
         self.connection_list = QtGui.QComboBox()
-        self.connection_list.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+        self.connection_list.setSizeAdjustPolicy(
+            QtGui.QComboBox.AdjustToContents)
         self.connection_list.activated.connect(self.conn_list_activated)
 
         self.toolbar = self.addToolBar('Connection')
@@ -72,10 +76,11 @@
         if iface == AP_INTROSPECTION_IFACE:
             self.statusBar().showMessage('Updating connection list')
             try:
-                dbus_address_instance = _get_dbus_address_object(str(conn), str(obj), self._dbus_bus)
+                dbus_address_instance = _get_dbus_address_object(
+                    str(conn), str(obj), self._dbus_bus)
                 proxy_object = _make_proxy_object(dbus_address_instance, None)
                 cls_name = proxy_object.__class__.__name__
-                if not self.selectable_interfaces.has_key(cls_name):
+                if not cls_name in self.selectable_interfaces:
                     self.selectable_interfaces[cls_name] = proxy_object
                     self.update_selectable_interfaces()
             except (dbus.DBusException, RuntimeError):
@@ -93,7 +98,7 @@
                     get_qt_icon(),
                     name,
                     QtCore.QVariant(proxy_obj)
-                    )
+                )
             else:
                 self.connection_list.addItem(name, QtCore.QVariant(proxy_obj))
 
@@ -108,7 +113,8 @@
         if dbus_details:
             self.tree_model = VisTreeModel(dbus_details)
             self.tree_view.setModel(self.tree_model)
-            self.tree_view.selectionModel().currentChanged.connect(self.tree_item_changed)
+            self.tree_view.selectionModel().currentChanged.connect(
+                self.tree_item_changed)
 
     def tree_item_changed(self, current, previous):
         proxy = current.internalPointer().dbus_object
@@ -145,8 +151,8 @@
     def num_children(self):
         """An optimisation that allows us to get the number of children without
         actually retrieving them all. This is useful since Qt needs to know if
-        there are children (to draw the drop-down triangle thingie), but doesn't
-        need to know about the details.
+        there are children (to draw the drop-down triangle thingie), but
+        doesn't need to know about the details.
 
         """
         num_children = 0
@@ -211,7 +217,7 @@
 
     def headerData(self, column, orientation, role):
         if (orientation == QtCore.Qt.Horizontal and
-            role == QtCore.Qt.DisplayRole):
+                role == QtCore.Qt.DisplayRole):
             try:
                 return QtCore.QVariant("Tree Node")
             except IndexError:

=== modified file 'autopilot/vis/objectproperties.py'
--- autopilot/vis/objectproperties.py	2013-05-30 20:38:08 +0000
+++ autopilot/vis/objectproperties.py	2013-07-14 08:34:30 +0000
@@ -42,8 +42,8 @@
     def tree_node_changed(self, new_node):
         """Call when the selected tree node has changed.
 
-        This method will update the available tabs to reflect those suitable for
-        the new tree node selected.
+        This method will update the available tabs to reflect those suitable
+        for the new tree node selected.
 
         """
         for view in self.views:
@@ -70,7 +70,8 @@
 
     def name(self):
         """Return the name of the view."""
-        raise NotImplementedError("This method must be implemented in subclasses!")
+        raise NotImplementedError(
+            "This method must be implemented in subclasses!")
 
     def icon(self):
         """Return the icon for the view (optionsla)."""
@@ -78,10 +79,12 @@
 
     def is_relevant(self, node):
         """Return true if the view can display data about this tree node."""
-        raise NotImplementedError("This method must be implemented in subclasses!")
+        raise NotImplementedError(
+            "This method must be implemented in subclasses!")
 
     def new_node_selected(self, node):
-        raise NotImplementedError("This method must be implemented in subclasses!")
+        raise NotImplementedError(
+            "This method must be implemented in subclasses!")
 
 
 class PropertyView(AbstractView):
@@ -119,7 +122,7 @@
             details_string = dbus_string_rep(object_details[key])
             item_name = QtGui.QTableWidgetItem(key)
             item_details = QtGui.QTableWidgetItem(
-                    details_string.decode('utf-8'))
+                details_string.decode('utf-8'))
             self.table_view.setItem(i, 0, item_name)
             self.table_view.setItem(i, 1, item_details)
         self.table_view.setSortingEnabled(True)
@@ -141,7 +144,8 @@
         self.signals_table.verticalHeader().setVisible(False)
         self.signals_table.setAlternatingRowColors(True)
         self.signals_table.setHorizontalHeaderLabels(["Signal Signature"])
-        self.signals_table.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.signals_table.setEditTriggers(
+            QtGui.QAbstractItemView.NoEditTriggers)
         self.details_layout.addWidget(self.signals_table)
 
     def name(self):
@@ -159,7 +163,8 @@
         signals = node.get_signals()
         self.signals_table.setRowCount(len(signals))
         for i, signal in enumerate(signals):
-            self.signals_table.setItem(i, 0, QtGui.QTableWidgetItem(str(signal)))
+            self.signals_table.setItem(
+                i, 0, QtGui.QTableWidgetItem(str(signal)))
         self.signals_table.setSortingEnabled(True)
         self.signals_table.sortByColumn(0, QtCore.Qt.AscendingOrder)
         self.signals_table.resizeColumnsToContents()
@@ -179,7 +184,8 @@
         self.slots_table.verticalHeader().setVisible(False)
         self.slots_table.setAlternatingRowColors(True)
         self.slots_table.setHorizontalHeaderLabels(["Slot Signature"])
-        self.slots_table.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.slots_table.setEditTriggers(
+            QtGui.QAbstractItemView.NoEditTriggers)
         self.details_layout.addWidget(self.slots_table)
 
     def name(self):
@@ -207,4 +213,4 @@
     PropertyView,
     SignalView,
     SlotView,
-    ]
+]

=== modified file 'autopilot/vis/resources.py'
--- autopilot/vis/resources.py	2013-05-30 20:21:13 +0000
+++ autopilot/vis/resources.py	2013-07-14 08:34:30 +0000
@@ -33,17 +33,17 @@
         return repr(bool(dbus_type))
     if isinstance(dbus_type, dbus.String):
         return dbus_type.encode('utf-8', errors='ignore')
-    if (isinstance(dbus_type, dbus.Int16)
-        or isinstance(dbus_type, dbus.UInt16)
-        or isinstance(dbus_type, dbus.Int32)
-        or isinstance(dbus_type, dbus.UInt32)
-        or isinstance(dbus_type, dbus.Int64)
-        or isinstance(dbus_type, dbus.UInt64)):
+    if (isinstance(dbus_type, dbus.Int16) or
+            isinstance(dbus_type, dbus.UInt16) or
+            isinstance(dbus_type, dbus.Int32) or
+            isinstance(dbus_type, dbus.UInt32) or
+            isinstance(dbus_type, dbus.Int64) or
+            isinstance(dbus_type, dbus.UInt64)):
         return repr(int(dbus_type))
     if isinstance(dbus_type, dbus.Double):
         return repr(float(dbus_type))
-    if (isinstance(dbus_type, dbus.Array)
-        or isinstance(dbus_type, dbus.Struct)):
+    if (isinstance(dbus_type, dbus.Array) or
+            isinstance(dbus_type, dbus.Struct)):
         return ', '.join([dbus_string_rep(i) for i in dbus_type])
     else:
         return repr(dbus_type)