From f6202e56311236008919290b8c9e2ce54e3f41a3 Mon Sep 17 00:00:00 2001 From: kimth Date: Tue, 7 Aug 2012 11:16:48 -0400 Subject: [PATCH] Tests provide xqueue params, rather than ModuleSystem.__init__ --- common/lib/xmodule/xmodule/tests/__init__.py | 2 +- common/lib/xmodule/xmodule/x_module.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index 4c0b6fc9b3..9b9a06e440 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -32,7 +32,7 @@ i4xs = ModuleSystem( user=Mock(), filestore=fs.osfs.OSFS(os.path.dirname(os.path.realpath(__file__))), debug=True, - xqueue=None, + xqueue={'interface':None, 'callback_url':'/', 'default_queuename':'null'}, is_staff=False ) diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 9b005d1dae..6166dad95c 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -678,10 +678,7 @@ class ModuleSystem(object): TODO (vshnayder): this will need to change once we have real user roles. ''' self.ajax_url = ajax_url - if xqueue is None: - self.xqueue = {'interface':None, 'callback_url':'/', 'default_queuename':'null'} - else: - self.xqueue = xqueue + self.xqueue = xqueue self.track_function = track_function self.filestore = filestore self.get_module = get_module