Skip to content

Commit

Permalink
Use django.utils.six.moves for StringIO, one more file from CMS is gone
Browse files Browse the repository at this point in the history
  • Loading branch information
Mateusz Marzantowicz committed Jul 8, 2014
1 parent b843d4f commit 80f47fe
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions cms/test_utils/util/context_managers.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# -*- coding: utf-8 -*-
import sys
from contextlib import contextmanager
from shutil import rmtree as _rmtree
from tempfile import template, mkdtemp
import sys

from django.conf import settings
from django.core.signals import request_started
from django.db import reset_queries
from django.template import context
from django.utils.six.moves import StringIO
from django.utils.translation import get_language, activate

from cms.utils.compat.string_io import StringIO
from cms.utils.compat.dj import get_user_model


Expand Down
2 changes: 1 addition & 1 deletion cms/test_utils/util/request_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
BOUNDARY, CONTENT_TYPE_RE)
from django.utils import six
from django.utils.encoding import smart_str
from django.utils.six.moves import StringIO

from cms.utils.compat.string_io import StringIO
from cms.utils.compat.urls import urlencode, urlparse, unquote


Expand Down
11 changes: 7 additions & 4 deletions cms/tests/docs.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import with_statement

import os
import socket

from django.utils.six.moves import StringIO

import cms
from cms.test_utils.compat import skipIf
from cms.test_utils.testcases import CMSTestCase
from cms.test_utils.util.context_managers import TemporaryDirectory
from sphinx.application import Sphinx
import cms
import os
import socket
from cms.utils.compat.string_io import StringIO


ROOT_DIR = os.path.dirname(cms.__file__)
Expand Down
15 changes: 8 additions & 7 deletions cms/tests/management.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
# -*- coding: utf-8 -*-
from __future__ import with_statement
import uuid

from django.contrib.sites.models import Site
from django.core.management import CommandError
from cms.models import Page, StaticPlaceholder
from django.core import management
from cms.test_utils.fixtures.navextenders import NavextendersFixture
from django.core.management import CommandError
from django.utils.six.moves import StringIO

from cms.test_utils.testcases import CMSTestCase
from cms.test_utils.util.context_managers import SettingsOverride
from cms.api import create_page, add_plugin, create_title
from cms.management.commands import cms
from cms.management.commands.subcommands.list import plugin_report
from cms.models.pluginmodel import CMSPlugin
from cms.models import Page, StaticPlaceholder
from cms.models.placeholdermodel import Placeholder
from cms.models.pluginmodel import CMSPlugin
from cms.test_utils.fixtures.navextenders import NavextendersFixture
from cms.test_utils.testcases import CMSTestCase
from cms.test_utils.util.context_managers import SettingsOverride
from djangocms_text_ckeditor.cms_plugins import TextPlugin
from cms.utils.compat.string_io import StringIO


APPHOOK = "SampleApp"
Expand Down
4 changes: 0 additions & 4 deletions cms/utils/compat/string_io.py

This file was deleted.

0 comments on commit 80f47fe

Please sign in to comment.