Merge remote-tracking branch 'upstream/master' into context-managers

bdraco · bdraco · commit a6eb18b68819 · 2021-06-05T15:13:13.000-10:00
diff --git a/zeroconf/__init__.py b/zeroconf/__init__.py
@@ -23,6 +23,7 @@
 import enum
 import errno
 import ipaddress
+import itertools
 import logging
 import platform
 import re
@@ -2936,9 +2937,7 @@ def handle_response(self, msg: DNSIncoming) -> None:  # pylint: disable=too-many
             # zc.get_service_info will see the cached value
             # but ONLY after all the record updates have been
             # processsed.
-            for record in address_adds:
-                self.cache.add(record)
-            for record in other_adds:
+            for record in itertools.chain(address_adds, other_adds):
                 self.cache.add(record)
             # Removes are processed last since
             # ServiceInfo could generate an un-needed query
@@ -2951,21 +2950,19 @@ def handle_query(  # pylint: disable=too-many-branches
     ) -> None:
         """Deal with incoming query packets.  Provides a response if
         possible."""
-        out = None
-
         # Support unicast client responses
         #
         if port != _MDNS_PORT:
             out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA, multicast=False)
             for question in msg.questions:
                 out.add_question(question)
+        else:
+            out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
 
         for question in msg.questions:
             if question.type == _TYPE_PTR:
                 if question.name == "_services._dns-sd._udp.local.":
                     for stype in self.registry.get_types():
-                        if out is None:
-                            out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
                         out.add_answer(
                             msg,
                             DNSPointer(
@@ -2979,8 +2976,6 @@ def handle_query(  # pylint: disable=too-many-branches
                     continue
 
                 for service in self.registry.get_infos_type(question.name):
-                    if out is None:
-                        out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
                     out.add_answer(msg, service.dns_pointer())
                     # Add recommended additional answers according to
                     # https://tools.ietf.org/html/rfc6763#section-12.1.
@@ -2991,9 +2986,6 @@ def handle_query(  # pylint: disable=too-many-branches
 
                 continue
 
-            if out is None:
-                out = DNSOutgoing(_FLAGS_QR_RESPONSE | _FLAGS_AA)
-
             name_to_find = question.name.lower()
             # Answer A record queries for any service addresses we know
             if question.type in (_TYPE_A, _TYPE_ANY):
