From 81cfb6c3bd130d0e1a6f791f9fa2f12e14942b13 Mon Sep 17 00:00:00 2001 From: Xavier Antoviaque Date: Thu, 6 Mar 2014 18:11:36 -0400 Subject: [PATCH] Update import location of `prefer_xmodules` --- cms/envs/common.py | 3 ++- lms/envs/common.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index e90d2b2139..e9f5455080 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -35,7 +35,8 @@ from path import path from lms.lib.xblock.mixin import LmsBlockMixin from cms.lib.xblock.mixin import CmsBlockMixin from xmodule.modulestore.inheritance import InheritanceMixin -from xmodule.x_module import XModuleMixin, prefer_xmodules +from xmodule.modulestore import prefer_xmodules +from xmodule.x_module import XModuleMixin from dealer.git import git ############################ FEATURE CONFIGURATION ############################# diff --git a/lms/envs/common.py b/lms/envs/common.py index a11480a0f5..1d20f2c83e 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -35,7 +35,8 @@ from .discussionsettings import * from lms.lib.xblock.mixin import LmsBlockMixin from xmodule.modulestore.inheritance import InheritanceMixin -from xmodule.x_module import XModuleMixin, prefer_xmodules +from xmodule.modulestore import prefer_xmodules +from xmodule.x_module import XModuleMixin ################################### FEATURES ################################### # The display name of the platform to be used in templates/emails/etc.