valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use six.string_types with isinstance instead of str check

Browse Source
This commit is contained in:
rallytime 2018-01-22 09:54:38 -05:00
parent 8d54b95d8c
commit e129d7fe68
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/nfs3.py
View File

@ -8,6 +8,7 @@ from __future__ import absolute_import, print_function, unicode_literals
import logging import logging
# Import salt libs # Import salt libs
from salt.ext import six
import salt.utils.files import salt.utils.files
import salt.utils.path import salt.utils.path
import salt.utils.stringutils import salt.utils.stringutils
@ -55,7 +56,7 @@ def list_exports(exports='/etc/exports'):
permcomps = perm.split('(') permcomps = perm.split('(')
permcomps[1] = permcomps[1].replace(')', '') permcomps[1] = permcomps[1].replace(')', '')
hosts = permcomps[0] hosts = permcomps[0]
if type(hosts) is not str: if not isinstance(hosts, six.string_types):
# Lists, etc would silently mangle /etc/exports # Lists, etc would silently mangle /etc/exports
raise TypeError('hosts argument must be a string') raise TypeError('hosts argument must be a string')
options = permcomps[1].split(',') options = permcomps[1].split(',')
@ -93,7 +94,7 @@ def add_export(exports='/etc/exports', path=None, hosts=None, options=None):
''' '''
if options is None: if options is None:
options = [] options = []
if type(hosts) is not str: if not isinstance(hosts, six.string_types):
# Lists, etc would silently mangle /etc/exports # Lists, etc would silently mangle /etc/exports
raise TypeError('hosts argument must be a string') raise TypeError('hosts argument must be a string')
edict = list_exports(exports) edict = list_exports(exports)