From 727bf37780babf5f56b037d52a8309fb7193bcac Mon Sep 17 00:00:00 2001 From: Christian Wyglendowski Date: Wed, 20 Nov 2013 23:33:59 -0500 Subject: [PATCH] Build a correct pyev 0.9.0 version tuple --- diesel/hub.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/diesel/hub.py b/diesel/hub.py index 3d34d66..962bad0 100644 --- a/diesel/hub.py +++ b/diesel/hub.py @@ -304,7 +304,7 @@ def __init__(self): @property def describe(self): - return "libev/pyev (%s/%s) backend=%s" % ( + return "pyev/libev (%s/%s) backend=%s" % ( self._pyev_version() + ({ 1 : "select()", 2 : "poll()", @@ -318,7 +318,9 @@ def _pyev_version(self): if hasattr(pyev, 'version'): return pyev.version() else: - return pyev.abi_version() + pyev_ver = pyev.__version__ + libev_ver = ".".join(str(p) for p in pyev.abi_version()) + return (pyev_ver, libev_ver) def handle_events(self): '''Run one pass of event handling.