Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import StringIO from six in a couple more places. #10688

Merged
merged 1 commit into from
Apr 13, 2015
Merged

Import StringIO from six in a couple more places. #10688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion v2/ansible/executor/module_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
__metaclass__ = type

# from python and deps
from cStringIO import StringIO
from six.moves import StringIO
import json
import os
import shlex
Expand Down
2 changes: 1 addition & 1 deletion v2/test/parsing/yaml/test_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

from StringIO import StringIO
from six.moves import StringIO
from collections import Sequence, Set, Mapping

from ansible.compat.tests import unittest
Expand Down