salt/utils/jinja.py: remove raw string formatting

DSRCorporation · Aug 27, 2015 · d5a7dcc · d5a7dcc
1 parent f446d46
commit d5a7dcc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
@@ -72,7 +72,7 @@ def __init__(self, opts, saltenv='base', encoding='utf-8', env=None,
             self.searchpath = opts['file_roots'][saltenv]
         else:
             self.searchpath = [path.join(opts['cachedir'], 'files', saltenv)]
-        log.debug('Jinja search path: {0!r}'.format(self.searchpath))
+        log.debug('Jinja search path: \'{0}\''.format(self.searchpath))
         self._file_client = None
         self.cached = []
         self.pillar_rend = pillar_rend
@@ -163,16 +163,16 @@ def __str__(self):
         for key, value in six.iteritems(self):
             if isinstance(value, six.string_types):
                 # keeps quotes around strings
-                output.append('{0!r}: {1!r}'.format(key, value))
+                output.append('\'{0}\': \'{1}\''.format(key, value))
             else:
                 # let default output
-                output.append('{0!r}: {1!s}'.format(key, value))
+                output.append('\'{0}\': {1!s}'.format(key, value))
         return '{' + ', '.join(output) + '}'
 
     def __repr__(self):  # pylint: disable=W0221
         output = []
         for key, value in six.iteritems(self):
-            output.append('{0!r}: {1!r}'.format(key, value))
+            output.append('\'{0}\': \'{1}\''.format(key, value))
         return '{' + ', '.join(output) + '}'