From 8aef15d9489d0bce3be9ae5aaf2db61f32da7033 Mon Sep 17 00:00:00 2001 From: Christian Schramm Date: Mon, 22 Dec 2014 11:26:11 +0100 Subject: [PATCH 1/3] pyuv >= 1.0.0 has 'getaddrinfo()' in 'dns' module --- gruvi/address.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gruvi/address.py b/gruvi/address.py index ca9de31..1cbecc2 100644 --- a/gruvi/address.py +++ b/gruvi/address.py @@ -72,8 +72,8 @@ def getaddrinfo(node, service=0, family=0, socktype=0, protocol=0, flags=0, time """ hub = get_hub() with switch_back(timeout) as switcher: - request = pyuv.util.getaddrinfo(hub.loop, switcher, node, service, family, - socktype, protocol, flags) + request = pyuv.dns.getaddrinfo(hub.loop, switcher, node, service, family, + socktype, protocol, flags) switcher.add_cleanup(request.cancel) result = hub.switch() result, error = result[0] From c7ccda73ec60fd49cf95f2b5d77f5df061f6f44d Mon Sep 17 00:00:00 2001 From: Christian Schramm Date: Mon, 22 Dec 2014 11:41:14 +0100 Subject: [PATCH 2/3] Use 'getnameinfo()' from the 'dns' module of pyuv --- gruvi/address.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gruvi/address.py b/gruvi/address.py index 1cbecc2..5bc73ba 100644 --- a/gruvi/address.py +++ b/gruvi/address.py @@ -94,7 +94,7 @@ def getnameinfo(sockaddr, flags=0, timeout=30): """ hub = get_hub() with switch_back(timeout) as switcher: - request = pyuv.util.getnameinfo(hub.loop, switcher, sockaddr, flags) + request = pyuv.dns.getnameinfo(hub.loop, switcher, sockaddr, flags) switcher.add_cleanup(request.cancel) result = hub.switch() result, error = result[0] From cf3a587c0392aea30283a6076ac10ada6d9f1921 Mon Sep 17 00:00:00 2001 From: Christian Schramm Date: Mon, 22 Dec 2014 11:53:47 +0100 Subject: [PATCH 3/3] Require pyuv >= 1.0 Also, install via pip instead of github download --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5b840bd..19478ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ cffi >= 0.8 fibers >= 0.4 -git+https://github.com/saghul/pyuv.git@pyuv-1.0.0.dev1#egg=pyuv +pyuv >= 1.0 six