Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gevent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gevent
Commits
2373a502
Commit
2373a502
authored
Jul 22, 2020
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pin dnspython < 2 for now; fully fixing it is going to be a bit involved.
parent
187a41c2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
docs/changes/1661.bugfix
docs/changes/1661.bugfix
+4
-0
setup.py
setup.py
+1
-1
src/gevent/resolver/dnspython.py
src/gevent/resolver/dnspython.py
+1
-2
No files found.
docs/changes/1661.bugfix
View file @
2373a502
Fix compatibility with dnspython 2.
Fix compatibility with dnspython 2.
.. caution:: This currently means that it can be imported. But it
cannot yet be used. gevent has a pinned dependency on
dnspython < 2 for now.
setup.py
View file @
2373a502
...
@@ -291,7 +291,7 @@ del _to_cythonize
...
@@ -291,7 +291,7 @@ del _to_cythonize
## Extras
## Extras
EXTRA_DNSPYTHON
=
[
EXTRA_DNSPYTHON
=
[
'dnspython >= 1.16.0'
,
'dnspython >= 1.16.0
, < 2.0
'
,
'idna'
,
'idna'
,
]
]
EXTRA_EVENTS
=
[
EXTRA_EVENTS
=
[
...
...
src/gevent/resolver/dnspython.py
View file @
2373a502
...
@@ -112,7 +112,7 @@ def _patch_dns():
...
@@ -112,7 +112,7 @@ def _patch_dns():
def
extra_all
(
mod_name
):
def
extra_all
(
mod_name
):
return
extras
.
get
(
mod_name
,
())
return
extras
.
get
(
mod_name
,
())
def
after_import_hook
(
dns
):
def
after_import_hook
(
dns
):
# pylint;disable=redefined-outer-name
# Runs while still in the original patching scope.
# Runs while still in the original patching scope.
# The dns.rdata:get_rdata_class() function tries to
# The dns.rdata:get_rdata_class() function tries to
# dynamically import modules using __import__ and then walk
# dynamically import modules using __import__ and then walk
...
@@ -150,7 +150,6 @@ def _patch_dns():
...
@@ -150,7 +150,6 @@ def _patch_dns():
top
.
rdata
.
__import__
=
_no_dynamic_imports
top
.
rdata
.
__import__
=
_no_dynamic_imports
return
top
return
top
dns
=
_patch_dns
()
dns
=
_patch_dns
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment