From f7987e6844aa40cdcf867cfa1185c8864e4a676c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl>
Date: Thu, 9 Jul 2020 18:28:36 +0200
Subject: [PATCH] friendlier on Windows
---
CHANGELOG.md | 1 +
coolamqp/__init__.py | 2 +-
coolamqp/uplink/listener/thread.py | 5 +++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 927d3e7..69b7f7b 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 b428709..994da12 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 52f918f..f66530e 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
--
GitLab