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.

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

import StringIO from six.moves #722

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rez/serialise.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
"""
from contextlib import contextmanager
from inspect import isfunction, ismodule, getargspec
from StringIO import StringIO
import sys
import stat
import os
@@ -21,6 +20,7 @@
from rez.config import config
from rez.vendor.atomicwrites import atomic_write
from rez.vendor.enum import Enum
from rez.vendor.six.six.moves import StringIO
from rez.vendor import yaml


2 changes: 1 addition & 1 deletion src/rez/tests/util.py
Original file line number Diff line number Diff line change
@@ -211,7 +211,7 @@ def get_cli_output(args):
"""

import sys
from StringIO import StringIO
from rez.vendor.six.six.moves import StringIO

command = args[0]
other_args = list(args[1:])