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

Remove duplicated code

Browse source
This commit is contained in:
Bo Maryniuk 2018-09-18 23:45:48 +02:00
parent 8e62633fd5
commit deb0b4e0ed
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
salt/_compat.py
View file

@ -78,28 +78,21 @@ def bytes_(s, encoding='latin-1', errors='strict'):
return s
if PY3:
def ascii_native_(s):
'''
Python 3 handler.
def ascii_native_(s):
'''
Python 2/3 handler.
:param s:
:return:
'''
if isinstance(s, text_type):
s = s.encode('ascii')
return str(s, 'ascii', 'strict')
else:
def ascii_native_(s):
'''
Python 2 handler.
:param s:
:return:
'''
if isinstance(s, text_type):
s = s.encode('ascii')
if PY3:
s = str(s, 'ascii', 'strict')
else:
s = str(s)
return s
:param s:
:return:
'''
if isinstance(s, text_type):
s = s.encode('ascii')
return str(s)
ascii_native_.__doc__ = '''
Python 3: If ``s`` is an instance of ``text_type``, return