old_contents: # -*- coding: utf-8 -*-
  '''
  Mako Renderer for Salt
  '''
  
  from __future__ import absolute_import
  
  # Import python libs
  from StringIO import StringIO
  
  # Import salt libs
  import salt.utils.templates
  from salt.exceptions import SaltRenderError
  
  
  def render(template_file, saltenv='base', sls='', context=None, tmplpath=None, **kws):
      '''
      Render the template_file, passing the functions and grains into the
      Mako rendering system.
  
      :rtype: string
      '''
      tmp_data = salt.utils.templates.MAKO(template_file, to_str=True,
                      salt=__salt__,
                      grains=__grains__,
                      opts=__opts__,
                      pillar=__pillar__,
                      saltenv=saltenv,
                      sls=sls,
                      context=context,
                      tmplpath=tmplpath,
                      **kws)
      if not tmp_data.get('result', False):
          raise SaltRenderError(tmp_data.get('data',
              'Unknown render error in mako renderer'))
      return StringIO(tmp_data['data'])
  
new_contents: # -*- coding: utf-8 -*-
  '''
  Mako Renderer for Salt
  '''
  
  # Import python libs
  from __future__ import absolute_import
  
  # Import salt libs
  import salt.ext.six as six
  import salt.utils.templates
  from salt.exceptions import SaltRenderError
  
  
  def render(template_file, saltenv='base', sls='', context=None, tmplpath=None, **kws):
      '''
      Render the template_file, passing the functions and grains into the
      Mako rendering system.
  
      :rtype: string
      '''
      tmp_data = salt.utils.templates.MAKO(template_file, to_str=True,
                      salt=__salt__,
                      grains=__grains__,
                      opts=__opts__,
                      pillar=__pillar__,
                      saltenv=saltenv,
                      sls=sls,
                      context=context,
                      tmplpath=tmplpath,
                      **kws)
      if not tmp_data.get('result', False):
          raise SaltRenderError(tmp_data.get('data',
              'Unknown render error in mako renderer'))
      return six.StringIO.StringIO(tmp_data['data'])
  
subject: Move StringIO import to use six for salt.renderers.mako.py