fix: only actually works on python 3.9 (update example)

python-zeroconf · Dec 10, 2023 · 1a20def · 1a20def
1 parent 55de5d4
commit 1a20def
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/examples/browser.py b/examples/browser.py
@@ -51,18 +51,18 @@ def on_service_state_change(
     parser.add_argument('--debug', action='store_true')
     parser.add_argument('--find', action='store_true', help='Browse all available services')
     version_group = parser.add_mutually_exclusive_group()
-    version_group.add_argument('--v6', action='store_true')
     version_group.add_argument('--v6-only', action='store_true')
+    version_group.add_argument('--v4-only', action='store_true')
     args = parser.parse_args()
 
     if args.debug:
         logging.getLogger('zeroconf').setLevel(logging.DEBUG)
-    if args.v6:
-        ip_version = IPVersion.All
-    elif args.v6_only:
+    if args.v6_only:
         ip_version = IPVersion.V6Only
-    else:
+    elif args.v4_only:
         ip_version = IPVersion.V4Only
+    else:
+        ip_version = IPVersion.All
 
     zeroconf = Zeroconf(ip_version=ip_version)
 

diff --git a/src/zeroconf/_services/info.py b/src/zeroconf/_services/info.py
@@ -86,7 +86,7 @@
 DNS_QUESTION_TYPE_QU = DNSQuestionType.QU
 DNS_QUESTION_TYPE_QM = DNSQuestionType.QM
 
-IPADDRESS_SUPPORTS_SCOPE_ID = sys.version_info >= (3, 8, 0)
+IPADDRESS_SUPPORTS_SCOPE_ID = sys.version_info >= (3, 9, 0)
 
 if TYPE_CHECKING:
     from .._core import Zeroconf

diff --git a/tests/services/test_info.py b/tests/services/test_info.py
@@ -539,7 +539,7 @@ def test_multiple_addresses():
     assert info.addresses == [address, address]
     assert info.parsed_addresses() == [address_parsed, address_parsed]
     assert info.parsed_scoped_addresses() == [address_parsed, address_parsed]
-    ipaddress_supports_scope_id = sys.version_info >= (3, 8, 0)
+    ipaddress_supports_scope_id = sys.version_info >= (3, 9, 0)
 
     if has_working_ipv6() and not os.environ.get('SKIP_IPV6'):
         address_v6_parsed = "2001:db8::1"
@@ -597,12 +597,12 @@ def test_multiple_addresses():
             assert info.parsed_scoped_addresses() == [
                 address_parsed,
                 address_v6_parsed,
-                address_v6_ll_scoped_parsed,
+                address_v6_ll_scoped_parsed if ipaddress_supports_scope_id else address_v6_ll_parsed,
             ]
             assert info.parsed_scoped_addresses(r.IPVersion.V4Only) == [address_parsed]
             assert info.parsed_scoped_addresses(r.IPVersion.V6Only) == [
                 address_v6_parsed,
-                address_v6_ll_scoped_parsed,
+                address_v6_ll_scoped_parsed if ipaddress_supports_scope_id else address_v6_ll_parsed,
             ]