mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-06 05:01:14 -07:00
Bump dnspython from 2.2.1 to 2.3.0 (#1975)
* Bump dnspython from 2.2.1 to 2.3.0 Bumps [dnspython](https://github.com/rthalley/dnspython) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/rthalley/dnspython/releases) - [Changelog](https://github.com/rthalley/dnspython/blob/master/doc/whatsnew.rst) - [Commits](https://github.com/rthalley/dnspython/compare/v2.2.1...v2.3.0) --- updated-dependencies: - dependency-name: dnspython dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update dnspython==2.3.0 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> [skip ci]
This commit is contained in:
dependabot[bot]
GitHub
parent
6910079330
commit
32c06a8b72
137 changed files with 7699 additions and 4277 deletions
|
|
@ -1,20 +1,26 @@
|
|||
import sys
|
||||
|
||||
if sys.platform == 'win32':
|
||||
if sys.platform == "win32":
|
||||
|
||||
from typing import Any
|
||||
|
||||
import dns.name
|
||||
|
||||
_prefer_wmi = True
|
||||
|
||||
import winreg
|
||||
import winreg # pylint: disable=import-error
|
||||
|
||||
# Keep pylint quiet on non-windows.
|
||||
try:
|
||||
WindowsError is None # pylint: disable=used-before-assignment
|
||||
except KeyError:
|
||||
WindowsError = Exception
|
||||
|
||||
try:
|
||||
try:
|
||||
import threading as _threading
|
||||
except ImportError: # pragma: no cover
|
||||
import dummy_threading as _threading # type: ignore
|
||||
import pythoncom
|
||||
import wmi
|
||||
import threading
|
||||
import pythoncom # pylint: disable=import-error
|
||||
import wmi # pylint: disable=import-error
|
||||
|
||||
_have_wmi = True
|
||||
except Exception:
|
||||
_have_wmi = False
|
||||
|
|
@ -23,7 +29,7 @@ if sys.platform == 'win32':
|
|||
# Sometimes DHCP servers add a '.' prefix to the default domain, and
|
||||
# Windows just stores such values in the registry (see #687).
|
||||
# Check for this and fix it.
|
||||
if domain.startswith('.'):
|
||||
if domain.startswith("."):
|
||||
domain = domain[1:]
|
||||
return dns.name.from_text(domain)
|
||||
|
||||
|
|
@ -34,7 +40,8 @@ if sys.platform == 'win32':
|
|||
self.search = []
|
||||
|
||||
if _have_wmi:
|
||||
class _WMIGetter(_threading.Thread):
|
||||
|
||||
class _WMIGetter(threading.Thread):
|
||||
def __init__(self):
|
||||
super().__init__()
|
||||
self.info = DnsInfo()
|
||||
|
|
@ -44,11 +51,14 @@ if sys.platform == 'win32':
|
|||
try:
|
||||
system = wmi.WMI()
|
||||
for interface in system.Win32_NetworkAdapterConfiguration():
|
||||
if interface.IPEnabled:
|
||||
if interface.IPEnabled and interface.DNSDomain:
|
||||
self.info.domain = _config_domain(interface.DNSDomain)
|
||||
self.info.nameservers = list(interface.DNSServerSearchOrder)
|
||||
self.info.search = [dns.name.from_text(x) for x in
|
||||
interface.DNSDomainSuffixSearchOrder]
|
||||
if interface.DNSDomainSuffixSearchOrder:
|
||||
self.info.search = [
|
||||
_config_domain(x)
|
||||
for x in interface.DNSDomainSuffixSearchOrder
|
||||
]
|
||||
break
|
||||
finally:
|
||||
pythoncom.CoUninitialize()
|
||||
|
|
@ -59,10 +69,11 @@ if sys.platform == 'win32':
|
|||
self.start()
|
||||
self.join()
|
||||
return self.info
|
||||
else:
|
||||
class _WMIGetter:
|
||||
pass
|
||||
|
||||
else:
|
||||
|
||||
class _WMIGetter: # type: ignore
|
||||
pass
|
||||
|
||||
class _RegistryGetter:
|
||||
def __init__(self):
|
||||
|
|
@ -74,13 +85,13 @@ if sys.platform == 'win32':
|
|||
# delimiter in between ' ' and ',' (and vice-versa) in various
|
||||
# versions of windows.
|
||||
#
|
||||
if entry.find(' ') >= 0:
|
||||
split_char = ' '
|
||||
elif entry.find(',') >= 0:
|
||||
split_char = ','
|
||||
if entry.find(" ") >= 0:
|
||||
split_char = " "
|
||||
elif entry.find(",") >= 0:
|
||||
split_char = ","
|
||||
else:
|
||||
# probably a singleton; treat as a space-separated list.
|
||||
split_char = ' '
|
||||
split_char = " "
|
||||
return split_char
|
||||
|
||||
def _config_nameservers(self, nameservers):
|
||||
|
|
@ -94,44 +105,44 @@ if sys.platform == 'win32':
|
|||
split_char = self._determine_split_char(search)
|
||||
search_list = search.split(split_char)
|
||||
for s in search_list:
|
||||
s = dns.name.from_text(s)
|
||||
s = _config_domain(s)
|
||||
if s not in self.info.search:
|
||||
self.info.search.append(s)
|
||||
|
||||
def _config_fromkey(self, key, always_try_domain):
|
||||
try:
|
||||
servers, _ = winreg.QueryValueEx(key, 'NameServer')
|
||||
servers, _ = winreg.QueryValueEx(key, "NameServer")
|
||||
except WindowsError:
|
||||
servers = None
|
||||
if servers:
|
||||
self._config_nameservers(servers)
|
||||
if servers or always_try_domain:
|
||||
try:
|
||||
dom, _ = winreg.QueryValueEx(key, 'Domain')
|
||||
dom, _ = winreg.QueryValueEx(key, "Domain")
|
||||
if dom:
|
||||
self.info.domain = _config_domain(dom)
|
||||
except WindowsError:
|
||||
pass
|
||||
else:
|
||||
try:
|
||||
servers, _ = winreg.QueryValueEx(key, 'DhcpNameServer')
|
||||
servers, _ = winreg.QueryValueEx(key, "DhcpNameServer")
|
||||
except WindowsError:
|
||||
servers = None
|
||||
if servers:
|
||||
self._config_nameservers(servers)
|
||||
try:
|
||||
dom, _ = winreg.QueryValueEx(key, 'DhcpDomain')
|
||||
dom, _ = winreg.QueryValueEx(key, "DhcpDomain")
|
||||
if dom:
|
||||
self.info.domain = _config_domain(dom)
|
||||
except WindowsError:
|
||||
pass
|
||||
try:
|
||||
search, _ = winreg.QueryValueEx(key, 'SearchList')
|
||||
search, _ = winreg.QueryValueEx(key, "SearchList")
|
||||
except WindowsError:
|
||||
search = None
|
||||
if search is None:
|
||||
try:
|
||||
search, _ = winreg.QueryValueEx(key, 'DhcpSearchList')
|
||||
search, _ = winreg.QueryValueEx(key, "DhcpSearchList")
|
||||
except WindowsError:
|
||||
search = None
|
||||
if search:
|
||||
|
|
@ -148,25 +159,27 @@ if sys.platform == 'win32':
|
|||
# from Windows 2000 through Vista.
|
||||
connection_key = winreg.OpenKey(
|
||||
lm,
|
||||
r'SYSTEM\CurrentControlSet\Control\Network'
|
||||
r'\{4D36E972-E325-11CE-BFC1-08002BE10318}'
|
||||
r'\%s\Connection' % guid)
|
||||
r"SYSTEM\CurrentControlSet\Control\Network"
|
||||
r"\{4D36E972-E325-11CE-BFC1-08002BE10318}"
|
||||
r"\%s\Connection" % guid,
|
||||
)
|
||||
|
||||
try:
|
||||
# The PnpInstanceID points to a key inside Enum
|
||||
(pnp_id, ttype) = winreg.QueryValueEx(
|
||||
connection_key, 'PnpInstanceID')
|
||||
connection_key, "PnpInstanceID"
|
||||
)
|
||||
|
||||
if ttype != winreg.REG_SZ:
|
||||
raise ValueError # pragma: no cover
|
||||
|
||||
device_key = winreg.OpenKey(
|
||||
lm, r'SYSTEM\CurrentControlSet\Enum\%s' % pnp_id)
|
||||
lm, r"SYSTEM\CurrentControlSet\Enum\%s" % pnp_id
|
||||
)
|
||||
|
||||
try:
|
||||
# Get ConfigFlags for this device
|
||||
(flags, ttype) = winreg.QueryValueEx(
|
||||
device_key, 'ConfigFlags')
|
||||
(flags, ttype) = winreg.QueryValueEx(device_key, "ConfigFlags")
|
||||
|
||||
if ttype != winreg.REG_DWORD:
|
||||
raise ValueError # pragma: no cover
|
||||
|
|
@ -192,17 +205,19 @@ if sys.platform == 'win32':
|
|||
|
||||
lm = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
|
||||
try:
|
||||
tcp_params = winreg.OpenKey(lm,
|
||||
r'SYSTEM\CurrentControlSet'
|
||||
r'\Services\Tcpip\Parameters')
|
||||
tcp_params = winreg.OpenKey(
|
||||
lm, r"SYSTEM\CurrentControlSet" r"\Services\Tcpip\Parameters"
|
||||
)
|
||||
try:
|
||||
self._config_fromkey(tcp_params, True)
|
||||
finally:
|
||||
tcp_params.Close()
|
||||
interfaces = winreg.OpenKey(lm,
|
||||
r'SYSTEM\CurrentControlSet'
|
||||
r'\Services\Tcpip\Parameters'
|
||||
r'\Interfaces')
|
||||
interfaces = winreg.OpenKey(
|
||||
lm,
|
||||
r"SYSTEM\CurrentControlSet"
|
||||
r"\Services\Tcpip\Parameters"
|
||||
r"\Interfaces",
|
||||
)
|
||||
try:
|
||||
i = 0
|
||||
while True:
|
||||
|
|
@ -224,6 +239,7 @@ if sys.platform == 'win32':
|
|||
lm.Close()
|
||||
return self.info
|
||||
|
||||
_getter_class: Any
|
||||
if _have_wmi and _prefer_wmi:
|
||||
_getter_class = _WMIGetter
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue