Merge branch 'develop' into fix-1080

digi604 · Aug 9, 2012 · 9d36473 · 9d36473
2 parents a23ebe7 + 7fecd87
commit 9d36473
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 179 deletions.
diff --git a/cms/test_utils/testcases.py b/cms/test_utils/testcases.py
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 from cms.models import Page
-from cms.test_utils.util.context_managers import (UserLoginContext,
+from cms.test_utils.util.context_managers import (UserLoginContext, 
     SettingsOverride)
-from cms.test_utils.util.request_factory import RequestFactory
 from django.conf import settings
 from django.contrib.auth.models import User, AnonymousUser
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.template.context import Context
 from django.test import testcases
-from django.test.client import Client
+from django.test.client import Client, RequestFactory
 from menus.menu_pool import menu_pool
 from urlparse import urljoin
 import sys

diff --git a/cms/test_utils/util/request_factory.py b/cms/test_utils/util/request_factory.py
diff --git a/cms/tests/admin.py b/cms/tests/admin.py
@@ -19,7 +19,6 @@
     URL_CMS_PAGE, URL_CMS_TRANSLATION_DELETE)
 from cms.test_utils.util.context_managers import SettingsOverride
 from cms.test_utils.util.mock import AttributeObject
-from cms.test_utils.util.request_factory import RequestFactory
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import site
@@ -29,7 +28,7 @@
 from django.core.urlresolvers import reverse
 from django.http import (Http404, HttpResponseBadRequest, HttpResponseForbidden, 
     HttpResponse)
-from django.test.client import Client
+from django.test.client import Client, RequestFactory
 from django.utils.encoding import smart_str
 from menus.menu_pool import menu_pool
 from types import MethodType

diff --git a/cms/tests/toolbar.py b/cms/tests/toolbar.py
@@ -2,13 +2,13 @@
 from cms.api import create_page
 from cms.cms_toolbar import CMSToolbar
 from cms.test_utils.testcases import SettingsOverrideTestCase
-from cms.test_utils.util.request_factory import RequestFactory
 from cms.toolbar.items import (Anchor, TemplateHTML, Switcher, List, ListItem, 
     GetButton)
 from django.conf import settings
 from django.contrib.auth.models import AnonymousUser, User
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.core.urlresolvers import reverse
+from django.test.client import RequestFactory
 
 class ToolbarUserMixin(object):
     def get_anon(self):