From 4e75878cae90fc065ea19eb6b2b679707d515a17 Mon Sep 17 00:00:00 2001 From: Nitin Madhok Date: Tue, 18 Nov 2014 00:41:48 -0500 Subject: [PATCH] Replaced module six in file /salt/fileserver/svnfs.py --- salt/fileserver/svnfs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/fileserver/svnfs.py b/salt/fileserver/svnfs.py index 63b18f1dad..bfaae1f46f 100644 --- a/salt/fileserver/svnfs.py +++ b/salt/fileserver/svnfs.py @@ -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__)