From ce4c76ef37eab17f62d69153f6bc1534cae1a99e Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Fri, 13 Sep 2013 16:56:33 -0400
Subject: [PATCH] Add mixins to XModuleDescriptors as they are loaded during
 xml parsing

---
 common/lib/xmodule/xmodule/x_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index d912dfaceb..e6a05264b9 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -576,10 +576,10 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
         org and course are optional strings that will be used in the generated
             module's url identifiers
         """
-        class_ = XModuleDescriptor.load_class(
+        class_ = system.mixologist.mix(XModuleDescriptor.load_class(
             etree.fromstring(xml_data).tag,
             default_class
-        )
+        ))
         # leave next line, commented out - useful for low-level debugging
         # log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % (
         #        etree.fromstring(xml_data).tag,class_))