Skip to content

Commit

Permalink
greendns: fix (remove) dns.name import
Browse files Browse the repository at this point in the history
#203

Also, separate tox environments py{27,34,py}-dns that install and test green DNS.
  • Loading branch information
temoto committed Feb 24, 2015
1 parent 3316c6e commit 3de49ae
Show file tree
Hide file tree
Showing 5 changed files with 145 additions and 131 deletions.
28 changes: 16 additions & 12 deletions .travis.yml
Expand Up @@ -2,27 +2,31 @@ language: python
python: 2.7
env:
- TOX_ENV=pep8
- TOX_ENV=py26-selects
- TOX_ENV=py26-poll
- TOX_ENV=py26-epolls
- TOX_ENV=py27-selects
- TOX_ENV=py27-poll
- TOX_ENV=py26-poll
- TOX_ENV=py26-selects
- TOX_ENV=py27-dns
- TOX_ENV=py27-epolls
- TOX_ENV=py33-selects
- TOX_ENV=py33-poll
- TOX_ENV=py27-poll
- TOX_ENV=py27-selects
- TOX_ENV=py33-epolls
- TOX_ENV=py34-selects
- TOX_ENV=py34-poll
- TOX_ENV=py33-poll
- TOX_ENV=py33-selects
- TOX_ENV=py34-dns
- TOX_ENV=py34-epolls
- TOX_ENV=pypy-selects
- TOX_ENV=pypy-poll
- TOX_ENV=py34-poll
- TOX_ENV=py34-selects
- TOX_ENV=pypy-dns
- TOX_ENV=pypy-epolls
- TOX_ENV=pypy-poll
- TOX_ENV=pypy-selects
matrix:
fast_finish: true
allow_failures:
- env: TOX_ENV=pypy-selects
- env: TOX_ENV=pypy-poll
- env: TOX_ENV=pypy-dns
- env: TOX_ENV=pypy-epolls
- env: TOX_ENV=pypy-poll
- env: TOX_ENV=pypy-selects
install:
- sudo apt-get update -qq
- sudo apt-get install -qq libssl-dev libmysqlclient-dev libpq-dev libzmq3-dev
Expand Down
30 changes: 9 additions & 21 deletions eventlet/support/greendns.py
Expand Up @@ -37,34 +37,22 @@
from eventlet import patcher
from eventlet.green import _socket_nodns
from eventlet.green import os
from eventlet.green import select
from eventlet.green import time
from eventlet.support import six


dns = patcher.import_patched('dns',
socket=_socket_nodns,
time=time,
select=select)
for pkg in ('dns.query', 'dns.exception', 'dns.inet', 'dns.message',
'dns.rdatatype', 'dns.resolver', 'dns.reversename',
'dns.rdataclass', 'dns.name', 'dns.rrset', 'dns.rdtypes',
'dns.ipv4', 'dns.ipv6'):
setattr(dns, pkg.split('.')[1],
patcher.import_patched(pkg, socket=_socket_nodns,
time=time, select=select))
dns = patcher.import_patched('dns')
dns.resolver = patcher.import_patched('dns.resolver')

for pkg in ('dns.entropy', 'dns.inet', 'dns.query'):
setattr(dns, pkg.split('.')[1], patcher.import_patched(pkg))
import dns.rdtypes
for pkg in ['dns.rdtypes.IN', 'dns.rdtypes.ANY']:
setattr(dns.rdtypes, pkg.split('.')[-1],
patcher.import_patched(pkg, socket=_socket_nodns,
time=time, select=select))
setattr(dns.rdtypes, pkg.split('.')[-1], patcher.import_patched(pkg))
for pkg in ['dns.rdtypes.IN.A', 'dns.rdtypes.IN.AAAA']:
setattr(dns.rdtypes.IN, pkg.split('.')[-1],
patcher.import_patched(pkg, socket=_socket_nodns,
time=time, select=select))
setattr(dns.rdtypes.IN, pkg.split('.')[-1], patcher.import_patched(pkg))
for pkg in ['dns.rdtypes.ANY.CNAME']:
setattr(dns.rdtypes.ANY, pkg.split('.')[-1],
patcher.import_patched(pkg, socket=_socket_nodns,
time=time, select=select))
setattr(dns.rdtypes.ANY, pkg.split('.')[-1], patcher.import_patched(pkg))


socket = _socket_nodns
Expand Down

0 comments on commit 3de49ae

Please sign in to comment.