1
=== modified file 'autopilot/display/_X11.py'
2
--- autopilot/display/_X11.py	2013-07-14 08:32:38 +0000
3
+++ autopilot/display/_X11.py	2013-07-19 04:38:28 +0000
4
@@ -21,6 +21,7 @@
5
21
import logging
21
import logging
6
22
22
7
23
from autopilot.display import Display as DisplayBase
23
from autopilot.display import Display as DisplayBase
8
24
from autopilot.utilities import Silence
9
24
25
10
25
logger = logging.getLogger(__name__)
26
logger = logging.getLogger(__name__)
11
26
27
12
@@ -30,9 +31,10 @@
13
30
        # Note: MUST import these here, rather than at the top of the file.
31
        # Note: MUST import these here, rather than at the top of the file.
14
31
        # Why? Because sphinx imports these modules to build the API
32
        # Why? Because sphinx imports these modules to build the API
15
32
        # documentation, which in turn tries to import Gdk, which in turn
33
        # documentation, which in turn tries to import Gdk, which in turn
17
33
        # fails because there's no DISPlAY environment set in the package
34
        # fails because there's no DISPLAY environment set in the package
18
34
        # builder.
35
        # builder.
20
35
        from gi.repository import Gdk
36
        with Silence():
21
37
            from gi.repository import Gdk
22
36
        self._default_screen = Gdk.Screen.get_default()
38
        self._default_screen = Gdk.Screen.get_default()
23
37
        if self._default_screen is None:
39
        if self._default_screen is None:
24
38
            raise RuntimeError(
40
            raise RuntimeError(
Reviewer	Review Type	Date Requested	Status
Martin Pitt (community)		2013-07-19	Approve on 2013-07-19
PS Jenkins bot	continuous-integration		Approve on 2013-07-19
Review via email: mp+175727@code.launchpad.net