Replaced module six in file /salt/fileserver/svnfs.py

This commit is contained in:
Nitin Madhok 2014-11-18 00:41:48 -05:00 committed by Pedro Algarvio
parent 3c263ca9fa
commit 4e75878cae

View File

@ -31,7 +31,7 @@ import logging
import os
import shutil
from datetime import datetime
from six import text_type as _text_type
from salt.utils.six import text_type as _text_type
PER_REMOTE_PARAMS = ('mountpoint', 'root', 'trunk', 'branches', 'tags')
@ -47,7 +47,7 @@ except ImportError:
# Import salt libs
import salt.utils
import salt.fileserver
from six import string_types
from salt.utils.six import string_types
from salt.utils.event import tagify
log = logging.getLogger(__name__)