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

Use MAXSIZE from six

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-19 23:32:36 +00:00
parent 38f3c2f980
commit a6ee44b693
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/parsers.py
View File

@ -21,6 +21,9 @@ import optparse
import traceback
from functools import partial
# Import 3rd-party libs
import salt.ext.six as six
# Import salt libs
import salt.config as config
import salt.exitcodes
@ -34,7 +37,6 @@ import salt.utils.xdg
from salt.utils import kinds
from salt.defaults import DEFAULT_TARGET_DELIM
from salt.utils.validate.path import is_writeable
from salt._compat import MAX_SIZE
def _sorted(mixins_or_funcs):
@ -207,7 +209,7 @@ class MergeConfigMixIn(object):
This mix-in should run last.
'''
__metaclass__ = MixInMeta
_mixin_prio_ = MAX_SIZE
_mixin_prio_ = six.MAXSIZE
def _mixin_setup(self):
if not hasattr(self, 'setup_config') and not hasattr(self, 'config'):