Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings

Fix some deprecation warnings.
2018-06-21 12:24:19 -04:00
parent b722fab98e b94ea6b4b1
commit df16836a8f
7 changed files with 42 additions and 55 deletions
--- a/openedx/core/lib/license/mixin.py
+++ b/openedx/core/lib/license/mixin.py
@@ -1,7 +1,8 @@
 """
 License mixin for XBlocks and XModules
 """
-from xblock.fields import Scope, String, XBlockMixin
+from xblock.core import XBlockMixin
+from xblock.fields import Scope, String

 # Make '_' a no-op so we can scrape strings. Using lambda instead of
 #  `django.utils.translation.ugettext_noop` because Django cannot be imported in this file