Remove some pylint workarounds (#925)

bdraco · web-flow · commit 1247acd2e6f6 · 2021-07-21T19:32:15.000-10:00
diff --git a/zeroconf/_dns.py b/zeroconf/_dns.py
@@ -48,8 +48,7 @@
 
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from ._protocol import DNSIncoming, DNSOutgoing  # pylint: disable=cyclic-import
+    from ._protocol import DNSIncoming, DNSOutgoing
 
 
 @enum.unique
diff --git a/zeroconf/_handlers.py b/zeroconf/_handlers.py
@@ -48,8 +48,7 @@
 )
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from ._core import Zeroconf  # pylint: disable=cyclic-import
+    from ._core import Zeroconf
 
 
 _AnswerWithAdditionalsType = Dict[DNSRecord, Set[DNSRecord]]
diff --git a/zeroconf/_logger.py b/zeroconf/_logger.py
@@ -24,7 +24,7 @@
 import sys
 from typing import Any, Dict, Union, cast
 
-log = logging.getLogger(__name__.split('.')[0])
+log = logging.getLogger(__name__.split('.', maxsplit=1)[0])
 log.addHandler(logging.NullHandler())
 
 
diff --git a/zeroconf/_protocol.py b/zeroconf/_protocol.py
@@ -51,8 +51,7 @@
 
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from ._cache import DNSCache  # pylint: disable=cyclic-import
+    from ._cache import DNSCache
 
 
 class DNSMessage:
diff --git a/zeroconf/_services/__init__.py b/zeroconf/_services/__init__.py
@@ -25,8 +25,7 @@
 
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from .._core import Zeroconf  # pylint: disable=cyclic-import
+    from .._core import Zeroconf
 
 
 @enum.unique
diff --git a/zeroconf/_services/browser.py b/zeroconf/_services/browser.py
@@ -65,8 +65,7 @@
 }
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from .._core import Zeroconf  # pylint: disable=cyclic-import
+    from .._core import Zeroconf
 
 
 _QuestionWithKnownAnswers = Dict[DNSQuestion, Set[DNSPointer]]
diff --git a/zeroconf/_services/info.py b/zeroconf/_services/info.py
@@ -53,8 +53,7 @@
 
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from .._core import Zeroconf  # pylint: disable=cyclic-import
+    from .._core import Zeroconf
 
 
 def instance_name_from_service_info(info: "ServiceInfo") -> str:
diff --git a/zeroconf/_updates.py b/zeroconf/_updates.py
@@ -27,8 +27,7 @@
 
 
 if TYPE_CHECKING:
-    # https://github.com/PyCQA/pylint/issues/3525
-    from ._core import Zeroconf  # pylint: disable=cyclic-import
+    from ._core import Zeroconf
 
 
 class RecordUpdate(NamedTuple):
diff --git a/zeroconf/_utils/net.py b/zeroconf/_utils/net.py
@@ -211,7 +211,7 @@ def set_mdns_port_socket_options_for_ip_version(
         s.setsockopt(_IPPROTO_IPV6, socket.IPV6_MULTICAST_LOOP, True)
 
 
-def new_socket(  # pylint: disable=too-many-branches
+def new_socket(
     bind_addr: Union[Tuple[str], Tuple[str, int, int]],
     port: int = _MDNS_PORT,
     ip_version: IPVersion = IPVersion.V4Only,

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@`
`48`	`48`	`)`
`49`	`49`
`50`	`50`	`if TYPE_CHECKING:`
`51`		`- # https://github.com/PyCQA/pylint/issues/3525`
`52`		`- from ._core import Zeroconf # pylint: disable=cyclic-import`
	`51`	`+ from ._core import Zeroconf`
`53`	`52`
`54`	`53`
`55`	`54`	`_AnswerWithAdditionalsType = Dict[DNSRecord, Set[DNSRecord]]`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if TYPE_CHECKING:`
`68`		`- # https://github.com/PyCQA/pylint/issues/3525`
`69`		`- from .._core import Zeroconf # pylint: disable=cyclic-import`
	`68`	`+ from .._core import Zeroconf`
`70`	`69`
`71`	`70`
`72`	`71`	`_QuestionWithKnownAnswers = Dict[DNSQuestion, Set[DNSPointer]]`