close uinput in __exit__ only if a fd exists

gvalkov · gvalkov · commit e86070572476 · 2013-12-19T19:21:04.000+01:00
diff --git a/evdev/uinput.py b/evdev/uinput.py
@@ -91,7 +91,8 @@ def __enter__(self):
         return self
 
     def __exit__(self, type, value, tb):
-        self.close()
+        if hasattr(self, 'fd'):
+            self.close()
 
     def __repr__(self):
         # :todo:
@@ -111,12 +112,12 @@ def __str__(self):
         return msg
 
     def close(self):
-        # close the associated InputDevice, if we managed to open it
+        # close the associated InputDevice, if it was previously opened
         if self.device is not None:
             self.device.close()
 
         # destroy the uinput device
-        if self.fd and self.fd > -1:
+        if self.fd > -1:
             _uinput.close(self.fd)
             self.fd = -1
 
