cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Python 3: the StringIO module is gone

Browse source 
Fixes 17 failing tests on Python 3.4, restoring the 8 failures we had
last Friday.
This commit is contained in:
Marius Gedminas 2015-09-28 09:26:36 +03:00
parent 4cd810a674
commit 9b39af8e9a
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/template/__init__.py
View file

@ -19,13 +19,12 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import StringIO
import ast import ast
import contextlib import contextlib
import os import os
import re import re
from six import string_types, text_type, binary_type from six import string_types, text_type, binary_type, StringIO
from jinja2 import Environment from jinja2 import Environment
from jinja2.loaders import FileSystemLoader from jinja2.loaders import FileSystemLoader
from jinja2.exceptions import TemplateSyntaxError, UndefinedError from jinja2.exceptions import TemplateSyntaxError, UndefinedError
@ -214,7 +213,7 @@ class Templar:
if not isinstance(orig_data, string_types): if not isinstance(orig_data, string_types):
return orig_data return orig_data
with contextlib.closing(StringIO.StringIO(orig_data)) as data: with contextlib.closing(StringIO(orig_data)) as data:
# these variables keep track of opening block locations, as we only # these variables keep track of opening block locations, as we only
# want to replace matched pairs of print/block tags # want to replace matched pairs of print/block tags
print_openings = [] print_openings = []