Resolved conflicts from rebase to master; fixed keyword error caught by

pylint
2013-03-28 08:58:56 -04:00
parent 27a31230bf
commit 3eefb7d5ec
1 changed files with 1 additions and 1 deletions
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -289,7 +289,7 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
            self._assert_loads('static_tab', kwargs, descriptor)

        elif descriptor.location.category == 'course_info':
-            self._assert_loads('info', kwargs={'course_id': course_id}, 
+            self._assert_loads('info', {'course_id': course_id}, 
                                descriptor)

        elif descriptor.location.category == 'custom_tag_template':