Merge lp:~veebers/autopilot/fix_1202609_silence_gdk_import_output into lp:autopilot

[Christopher Lee]

Silence non fatal error message from logs when attempting to import Gdk.

Silence non fatal error message from logs when attempting to import Gdk.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Martin Pitt (pitti)]

Hah, I like "with Silence()", nice wrapper!

Thanks.

review: Approve

=== modified file 'autopilot/display/_X11.py'
--- autopilot/display/_X11.py	2013-07-14 08:32:38 +0000
+++ autopilot/display/_X11.py	2013-07-19 04:38:28 +0000
@@ -21,6 +21,7 @@
 import logging
 
 from autopilot.display import Display as DisplayBase
+from autopilot.utilities import Silence
 
 logger = logging.getLogger(__name__)
 
@@ -30,9 +31,10 @@
         # 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
+        # fails because there's no DISPLAY environment set in the package
         # builder.
-        from gi.repository import Gdk
+        with Silence():
+            from gi.repository import Gdk
         self._default_screen = Gdk.Screen.get_default()
         if self._default_screen is None:
             raise RuntimeError(