]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
the prior fix for exception handling was still not right, missing a continue
authorBob Halley <halley@dnspython.org>
Fri, 29 May 2020 15:48:23 +0000 (08:48 -0700)
committerBob Halley <halley@dnspython.org>
Fri, 29 May 2020 15:48:23 +0000 (08:48 -0700)
dns/resolver.py
dns/trio/resolver.py

index f9dbd641ca317415bcf218f9136a2849cb7e9cee..54ed52925e1b43dda89e8d702108551f94f3b545 100644 (file)
@@ -1094,6 +1094,7 @@ class Resolver(object):
                             continue
                 except Exception as ex:
                     (_, done) = resolution.query_result(None, ex)
+                    continue
                 (answer, done) = resolution.query_result(response, None)
                 # Note we need to say "if answer is not None" and not just
                 # "if answer" because answer implements __len__, and python
index 4551857c12d7231c31684f880a4dffd12d268f4c..07e70f97d6f9f06a24adf8172579f38a065a4c02 100644 (file)
@@ -127,6 +127,7 @@ class Resolver(dns.resolver.Resolver):
                             raise NotImplementedError
                 except Exception as ex:
                     (_, done) = resolution.query_result(None, ex)
+                    continue
                 (answer, done) = resolution.query_result(response, None)
                 # Note we need to say "if answer is not None" and not just
                 # "if answer" because answer implements __len__, and python