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

Py3 compatibility fixes

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-21 17:22:23 +00:00
parent e27ac3e66e
commit 36bc86bdfa
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/utils/args.py
View File

@ -8,12 +8,14 @@ from __future__ import absolute_import
import re import re
import inspect import inspect
# Import salt libs # Import 3rd-party libs
from salt.ext.six import string_types, integer_types
import salt.ext.six as six import salt.ext.six as six
#KWARG_REGEX = re.compile(r'^([^\d\W][\w.-]*)=(?!=)(.*)$', re.UNICODE) # python 3
KWARG_REGEX = re.compile(r'^([^\d\W][\w.-]*)=(?!=)(.*)$') if six.PY3:
KWARG_REGEX = re.compile(r'^([^\d\W][\w.-]*)=(?!=)(.*)$', re.UNICODE)
else:
KWARG_REGEX = re.compile(r'^([^\d\W][\w.-]*)=(?!=)(.*)$')
def condition_input(args, kwargs): def condition_input(args, kwargs):
@ -22,7 +24,7 @@ def condition_input(args, kwargs):
''' '''
ret = [] ret = []
for arg in args: for arg in args:
if isinstance(arg, long): if isinstance(arg, six.integer_types):
ret.append(str(arg)) ret.append(str(arg))
else: else:
ret.append(arg) ret.append(arg)
@ -44,7 +46,7 @@ def parse_input(args, condition=True):
_args = [] _args = []
_kwargs = {} _kwargs = {}
for arg in args: for arg in args:
if isinstance(arg, string_types) and r'\n' not in arg and '\n' not in arg: if isinstance(arg, six.string_types) and r'\n' not in arg and '\n' not in arg:
arg_name, arg_value = parse_kwarg(arg) arg_name, arg_value = parse_kwarg(arg)
if arg_name: if arg_name:
_kwargs[arg_name] = yamlify_arg(arg_value) _kwargs[arg_name] = yamlify_arg(arg_value)
@ -86,7 +88,7 @@ def yamlify_arg(arg):
''' '''
yaml.safe_load the arg yaml.safe_load the arg
''' '''
if not isinstance(arg, string_types): if not isinstance(arg, six.string_types):
return arg return arg
if arg.strip() == '': if arg.strip() == '':
@ -116,14 +118,14 @@ def yamlify_arg(arg):
if isinstance(arg, dict): if isinstance(arg, dict):
# dicts must be wrapped in curly braces # dicts must be wrapped in curly braces
if (isinstance(original_arg, string_types) and if (isinstance(original_arg, six.string_types) and
not original_arg.startswith('{')): not original_arg.startswith('{')):
return original_arg return original_arg
else: else:
return arg return arg
elif arg is None \ elif arg is None \
or isinstance(arg, (list, float, integer_types, string_types)): or isinstance(arg, (list, float, six.integer_types, six.string_types)):
# yaml.safe_load will load '|' as '', don't let it do that. # yaml.safe_load will load '|' as '', don't let it do that.
if arg == '' and original_arg in ('|',): if arg == '' and original_arg in ('|',):
return original_arg return original_arg