Linux: move _cleanup() content to __del__()

BoboTiG · BoboTiG · commit 887453736dcf · 2016-04-30T10:06:09.000+02:00
diff --git a/mss/linux.py b/mss/linux.py
@@ -73,17 +73,20 @@ class MSS(MSSBase):
 
     # pylint: disable=R0902
 
+    display = None
+
     def __del__(self):
-        ''' Quit. '''
+        ''' Disconnect from X server. '''
 
-        self._cleanup()
+        if self.display:
+            self.xlib.XCloseDisplay(self.display)
+            self.display = None
 
     def __init__(self):
         ''' GNU/Linux initialisations. '''
 
         self.use_mss = False
         disp = None
-        self.display = None
         try:
             if version > '3':
                 disp = bytes(environ['DISPLAY'], 'utf-8')
@@ -123,16 +126,6 @@ def __init__(self):
         self.screen = self.xlib.XDefaultScreen(self.display)
         self.root = self.xlib.XDefaultRootWindow(self.display, self.screen)
 
-    def _cleanup(self):
-        ''' Disconnect from X server. '''
-
-        try:
-            if self.display:
-                self.xlib.XCloseDisplay(self.display)
-                self.display = None
-        except AttributeError:
-            pass
-
     def _set_argtypes(self):
         ''' Functions arguments.
 
