From 9b39af8e9a49f86cb8461920522834119122b404 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Mon, 28 Sep 2015 09:26:36 +0300 Subject: [PATCH] Python 3: the StringIO module is gone Fixes 17 failing tests on Python 3.4, restoring the 8 failures we had last Friday. --- lib/ansible/template/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py index ca0e72ede4..ae6d9af18e 100644 --- a/lib/ansible/template/__init__.py +++ b/lib/ansible/template/__init__.py @@ -19,13 +19,12 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import StringIO import ast import contextlib import os 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.loaders import FileSystemLoader from jinja2.exceptions import TemplateSyntaxError, UndefinedError @@ -214,7 +213,7 @@ class Templar: if not isinstance(orig_data, string_types): 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 # want to replace matched pairs of print/block tags print_openings = []