saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ran pre-commit hook

Browse source
This commit is contained in:
Dmitry Kuzmenko 2020-08-28 15:03:10 +03:00 • committed by Daniel Wozniak
parent 3c86a5a9ca
commit af185d74eb
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/daemons/__init__.py
View file

@ -1,17 +1,12 @@
# -*- coding: utf-8 -*-
"""
The daemons package is used to store implementations of the Salt Master and
Minion enabling different transports.
"""
from __future__ import absolute_import, print_function, unicode_literals
import logging
# Import Python Libs
import sys
from collections.abc import Iterable, Mapping, Sequence
# Import Salt Libs
from salt.ext import six
log = logging.getLogger(__name__)
@ -25,7 +20,7 @@ def is_non_string_iterable(obj):
for non string iterables.
Assumes in Python3 that, basestring = (str, bytes)
"""
return not isinstance(obj, six.string_types) and isinstance(obj, Iterable)
return not isinstance(obj, str) and isinstance(obj, Iterable)
def is_non_string_sequence(obj):
@ -36,7 +31,7 @@ def is_non_string_sequence(obj):
for non string sequences.
Assumes in Python3 that, basestring = (str, bytes)
"""
return not isinstance(obj, six.string_types) and isinstance(obj, Sequence)
return not isinstance(obj, str) and isinstance(obj, Sequence)
def extract_masters(opts, masters="master", port=None, raise_if_empty=True):
@ -147,7 +142,7 @@ def extract_masters(opts, masters="master", port=None, raise_if_empty=True):
entries = opts.get(masters, [])
if not entries:
emsg = "Invalid or missing opts['{0}'].".format(masters)
emsg = "Invalid or missing opts['{}'].".format(masters)
log.error(emsg)
if raise_if_empty:
raise ValueError(emsg)
@ -161,7 +156,7 @@ def extract_masters(opts, masters="master", port=None, raise_if_empty=True):
internal = entry.get("internal", "")
hostages.append(dict(external=external, internal=internal))
elif isinstance(entry, six.string_types): # string
elif isinstance(entry, str): # string
external = entry
internal = ""
hostages.append(dict(external=external, internal=internal))
@ -171,7 +166,7 @@ def extract_masters(opts, masters="master", port=None, raise_if_empty=True):
internal = entries.get("internal", "")
hostages.append(dict(external=external, internal=internal))
elif isinstance(entries, six.string_types): # string
elif isinstance(entries, str): # string
external = entries
internal = ""
hostages.append(dict(external=external, internal=internal))