diff --git a/CHANGELOG.md b/CHANGELOG.md index 927d3e76ff8fa2913bfc68aff0ad9d7d5d9e7355..69b7f7b3b5c0bb460218978289ec06a756832a24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,4 +4,5 @@ have been made so far, between releases. # v1.2.7 +* is far more friendly on Windows, which doesn't have epoll diff --git a/coolamqp/__init__.py b/coolamqp/__init__.py index b42870986d500297da165634832858772a974c5e..994da12a0f892cbd770be2762c663ce3b9b153c9 100644 --- a/coolamqp/__init__.py +++ b/coolamqp/__init__.py @@ -1 +1 @@ -__version__ = '1.2.7_a1' +__version__ = '1.2.7_a2' diff --git a/coolamqp/uplink/listener/thread.py b/coolamqp/uplink/listener/thread.py index 52f918ff65175ec169f4f0a17f1976134dc306de..f66530e40aef333fb1ee4be33003c1963012d177 100644 --- a/coolamqp/uplink/listener/thread.py +++ b/coolamqp/uplink/listener/thread.py @@ -5,9 +5,8 @@ import threading import logging import typing as tp import os -from coolamqp.objects import Callable -from coolamqp.uplink.listener.epoll_listener import EpollListener from coolamqp.uplink.listener.select_listener import SelectListener +from coolamqp.objects import Callable from coolamqp.uplink.listener.base_listener import BaseListener from coolamqp.utils import prctl_set_name @@ -28,12 +27,14 @@ def get_listener_class(): # type: () -> tp.Type[BaseListener] try: import gevent.socket except ImportError: + from coolamqp.uplink.listener.epoll_listener import EpollListener return EpollListener import socket if socket.socket is gevent.socket.socket: return SelectListener # gevent is active + from coolamqp.uplink.listener.epoll_listener import EpollListener return EpollListener