The cython extension should stop itself when closed too.

src/gevent/_ffi/watcher.py

@@ -342,6 +342,7 @@ class watcher(object):
     def _watcher_set_data(self, the_watcher, data):
         # This abstraction exists for the sole benefit of
         # libuv.watcher.stat, which "subclasses" uv_handle_t.
+        # Can we do something to avoid this extra function call?
         the_watcher.data = data
         return data
 

src/gevent/libev/corecext.ppyx

@@ -794,7 +794,7 @@ cdef public class watcher [object PyGeventWatcherObject, type PyGeventWatcher_Ty
         return ''
 
     def close(self):
-        pass
+        self.stop()
 
     def __enter__(self):
         return self

src/greentest/test__event.py

@@ -206,10 +206,10 @@ class TestWait(greentest.TestCase):
         else:
             expected_len = min(max_len, self.timeout / self.period)
         if self.count is None:
-            assert sender.ready()
+            self.assertTrue(sender.ready(), sender)
         else:
             expected_len = min(self.count, expected_len)
-            assert not sender.ready()
+            self.assertFalse(sender.ready(), sender)
             sender.kill()
         self.assertEqual(expected_len, len(results), (expected_len, len(results), results))
 

src/greentest/test__fileobject.py

@@ -27,7 +27,6 @@ class Test(greentest.TestCase):
     def _do_test_del(self, pipe, **kwargs):
         r, w = pipe
         s = FileObject(w, 'wb', **kwargs)
-        ts = type(s)
         s.write(b'x')
         try:
             s.flush()