refactor: remove backport of 'atexit.unregister'

kazoo/handlers/eventlet.py

@@ -1,6 +1,7 @@
 """A eventlet based handler."""
 from __future__ import absolute_import
 
+import atexit
 import contextlib
 import logging
 
@@ -12,7 +13,6 @@
 from eventlet import queue as green_queue
 
 from kazoo.handlers import utils
-import kazoo.python2atexit as python2atexit
 from kazoo.handlers.utils import selector_select
 
 LOG = logging.getLogger(__name__)
@@ -140,15 +140,15 @@ def start(self):
             w = eventlet.spawn(self._process_callback_queue)
             self._workers.append((w, self.callback_queue))
             self._started = True
-            python2atexit.register(self.stop)
+            atexit.register(self.stop)
 
     def stop(self):
         while self._workers:
             w, q = self._workers.pop()
             q.put(_STOP)
             w.wait()
         self._started = False
-        python2atexit.unregister(self.stop)
+        atexit.unregister(self.stop)
 
     def socket(self, *args, **kwargs):
         return utils.create_tcp_socket(green_socket)

kazoo/handlers/gevent.py

@@ -1,6 +1,7 @@
 """A gevent based handler."""
 from __future__ import absolute_import
 
+import atexit
 import logging
 
 import gevent
@@ -19,7 +20,6 @@
     from gevent.coros import Semaphore, RLock
 
 from kazoo.handlers import utils
-from kazoo import python2atexit
 
 _using_libevent = gevent.__version__.startswith("0.")
 
@@ -104,7 +104,7 @@ def start(self):
             for queue in (self.callback_queue,):
                 w = self._create_greenlet_worker(queue)
                 self._workers.append(w)
-            python2atexit.register(self.stop)
+            atexit.register(self.stop)
 
     def stop(self):
         """Stop the greenlet workers and empty all queues."""
@@ -124,7 +124,7 @@ def stop(self):
             # Clear the queues
             self.callback_queue = self.queue_impl()  # pragma: nocover
 
-            python2atexit.unregister(self.stop)
+            atexit.unregister(self.stop)
 
     def select(self, *args, **kwargs):
         return selector_select(

kazoo/handlers/threading.py

@@ -12,13 +12,13 @@
 """
 from __future__ import absolute_import
 
+import atexit
 import logging
 import queue
 import socket
 import threading
 import time
 
-import kazoo.python2atexit as python2atexit
 from kazoo.handlers import utils
 from kazoo.handlers.utils import selector_select
 
@@ -141,7 +141,7 @@ def start(self):
                 w = self._create_thread_worker(work_queue)
                 self._workers.append(w)
             self._running = True
-            python2atexit.register(self.stop)
+            atexit.register(self.stop)
 
     def stop(self):
         """Stop the worker threads and empty all queues."""
@@ -162,7 +162,7 @@ def stop(self):
             # Clear the queues
             self.callback_queue = self.queue_impl()
             self.completion_queue = self.queue_impl()
-            python2atexit.unregister(self.stop)
+            atexit.unregister(self.stop)
 
     def select(self, *args, **kwargs):
         return selector_select(*args, **kwargs)

kazoo/testing/harness.py

@@ -1,10 +1,10 @@
 """Kazoo testing harnesses"""
+import atexit
 import logging
 import os
 import uuid
 import unittest
 
-from kazoo import python2atexit as atexit
 from kazoo.client import KazooClient
 from kazoo.exceptions import KazooException
 from kazoo.protocol.connection import _CONNECTION_DROP, _SESSION_EXPIRED