Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports

Browse Source
This commit is contained in:
Vik Paruchuri
2013-02-11 18:43:47 -05:00
parent c2b32b7038
commit b9bf96520e
18 changed files with 21 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/lib/xmodule/xmodule/combined_open_ended_module.py
View File

@@ -1,25 +1,13 @@
import copy
from fs.errors import ResourceNotFoundError
import itertools
import json
import logging
from lxml import etree
from lxml.html import rewrite_links
from path import path
import os
import sys
from pkg_resources import resource_string
from .capa_module import only_one, ComplexEncoder
from .editing_module import EditingDescriptor
from .html_checker import check_html
from progress import Progress
from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
from combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
from open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
log = logging.getLogger("mitx.courseware")

1
common/lib/xmodule/xmodule/open_ended_grading_classes/__init__.py Normal file
View File

@@ -0,0 +1 @@
__author__ = 'vik'

11
common/lib/xmodule/xmodule/combined_open_ended_modulev1.py → common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
View File

@@ -1,14 +1,7 @@
import copy
from fs.errors import ResourceNotFoundError
import itertools
import json
import logging
from lxml import etree
from lxml.html import rewrite_links
from path import path
import os
import sys
import re
from pkg_resources import resource_string
@@ -19,14 +12,12 @@ from progress import Progress
from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
import self_assessment_module
import open_ended_module
from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
from .stringify import stringify_children
import dateutil
import dateutil.parser
import datetime
from timeparse import parse_timedelta
log = logging.getLogger("mitx.courseware")

0
common/lib/xmodule/xmodule/combined_open_ended_rubric.py → common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
View File

2
common/lib/xmodule/xmodule/grading_service_module.py → common/lib/xmodule/xmodule/open_ended_grading_classes/grading_service_module.py
View File

@@ -5,7 +5,7 @@ import requests
from requests.exceptions import RequestException, ConnectionError, HTTPError
import sys
from xmodule.combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
from combined_open_ended_rubric import CombinedOpenEndedRubric
from lxml import etree
log = logging.getLogger(__name__)

0
common/lib/xmodule/xmodule/open_ended_image_submission.py → common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_image_submission.py
View File

12
common/lib/xmodule/xmodule/open_ended_module.py → common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
View File

@@ -5,28 +5,18 @@ hints, answers, and assessment judgment (currently only correct/incorrect).
Parses xml definition file--see below for exact format.
"""
import copy
from fs.errors import ResourceNotFoundError
import itertools
import json
import logging
from lxml import etree
from lxml.html import rewrite_links
from path import path
import os
import sys
import hashlib
import capa.xqueue_interface as xqueue_interface
from pkg_resources import resource_string
from .capa_module import only_one, ComplexEncoder
from .capa_module import ComplexEncoder
from .editing_module import EditingDescriptor
from .html_checker import check_html
from progress import Progress
from .stringify import stringify_children
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
from capa.util import *
import openendedchild

2
common/lib/xmodule/xmodule/openendedchild.py → common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
View File

@@ -16,6 +16,7 @@ import re
from pkg_resources import resource_string
from .capa_module import only_one, ComplexEncoder
from open_ended_grading_classes import open_ended_image_submission
from .editing_module import EditingDescriptor
from .html_checker import check_html
from progress import Progress
@@ -23,7 +24,6 @@ from .stringify import stringify_children
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
from capa.util import *
import open_ended_image_submission
from datetime import datetime

7
common/lib/xmodule/xmodule/peer_grading_service.py → common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
View File

@@ -1,12 +1,7 @@
import json
import logging
import requests
from requests.exceptions import RequestException, ConnectionError, HTTPError
import sys
from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
from lxml import etree
from grading_service_module import GradingService, GradingServiceError
from grading_service_module import GradingService
log = logging.getLogger(__name__)

14
common/lib/xmodule/xmodule/self_assessment_module.py → common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
View File

@@ -1,27 +1,17 @@
import copy
from fs.errors import ResourceNotFoundError
import itertools
import json
import logging
from lxml import etree
from lxml.html import rewrite_links
from path import path
import os
import sys
from pkg_resources import resource_string
from .capa_module import only_one, ComplexEncoder
from .capa_module import ComplexEncoder
from .editing_module import EditingDescriptor
from .html_checker import check_html
from progress import Progress
from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
import openendedchild
from combined_open_ended_rubric import CombinedOpenEndedRubric
from open_ended_grading_classes.combined_open_ended_rubric import CombinedOpenEndedRubric
log = logging.getLogger("mitx.courseware")

16
common/lib/xmodule/xmodule/peer_grading_module.py
View File

@@ -1,29 +1,17 @@
import json
import logging
import requests
import sys
from combined_open_ended_rubric import CombinedOpenEndedRubric
from lxml import etree
import copy
import itertools
import json
import logging
from lxml.html import rewrite_links
import os
from pkg_resources import resource_string
from .capa_module import only_one, ComplexEncoder
from .capa_module import ComplexEncoder
from .editing_module import EditingDescriptor
from .html_checker import check_html
from progress import Progress
from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
from peer_grading_service import PeerGradingService, GradingServiceError
from open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError
log = logging.getLogger(__name__)

6
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
View File

@@ -2,9 +2,9 @@ import json
from mock import Mock, MagicMock, ANY
import unittest
from xmodule.openendedchild import OpenEndedChild
from xmodule.open_ended_module import OpenEndedModule
from xmodule.combined_open_ended_modulev1 import CombinedOpenEndedV1Module
from xmodule.open_ended_grading_classes.openendedchild import OpenEndedChild
from xmodule.open_ended_grading_classes.open_ended_module import OpenEndedModule
from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module
from xmodule.modulestore import Location
from lxml import etree

2
common/lib/xmodule/xmodule/tests/test_self_assessment.py
View File

@@ -2,7 +2,7 @@ import json
from mock import Mock
import unittest
from xmodule.self_assessment_module import SelfAssessmentModule
from xmodule.open_ended_grading_classes.self_assessment_module import SelfAssessmentModule
from xmodule.modulestore import Location
from lxml import etree

8
lms/djangoapps/open_ended_grading/controller_query_service.py
View File

@@ -1,12 +1,6 @@
import json
import logging
import requests
from requests.exceptions import RequestException, ConnectionError, HTTPError
import sys
from xmodule.grading_service_module import GradingService, GradingServiceError
from xmodule.open_ended_grading_classes.grading_service_module import GradingService
from django.conf import settings
from django.http import HttpResponse, Http404
from xmodule.x_module import ModuleSystem
from mitxmako.shortcuts import render_to_string

3
lms/djangoapps/open_ended_grading/open_ended_notifications.py
View File

@@ -1,7 +1,7 @@
from django.conf import settings
from xmodule.open_ended_grading_classes import peer_grading_service
from staff_grading_service import StaffGradingService
from open_ended_grading.controller_query_service import ControllerQueryService
from xmodule import peer_grading_service
import json
from student.models import unique_id_for_user
import open_ended_util
@@ -10,7 +10,6 @@ import logging
from courseware.access import has_access
from util.cache import cache
import datetime
from xmodule import peer_grading_service
from xmodule.x_module import ModuleSystem
from mitxmako.shortcuts import render_to_string

5
lms/djangoapps/open_ended_grading/staff_grading_service.py
View File

@@ -4,10 +4,7 @@ This module provides views that proxy to the staff grading backend service.
import json
import logging
import requests
from requests.exceptions import RequestException, ConnectionError, HTTPError
import sys
from xmodule.grading_service_module import GradingService, GradingServiceError
from xmodule.open_ended_grading_classes.grading_service_module import GradingService, GradingServiceError
from django.conf import settings
from django.http import HttpResponse, Http404

3
lms/djangoapps/open_ended_grading/tests.py
View File

@@ -6,7 +6,8 @@ django-admin.py test --settings=lms.envs.test --pythonpath=. lms/djangoapps/open
from django.test import TestCase
from open_ended_grading import staff_grading_service
from xmodule import peer_grading_service, peer_grading_module
from xmodule.open_ended_grading_classes import peer_grading_service
from xmodule import peer_grading_module
from django.core.urlresolvers import reverse
from django.contrib.auth.models import Group

4
lms/djangoapps/open_ended_grading/views.py
View File

@@ -2,7 +2,6 @@
import logging
import urllib
import re
from django.conf import settings
from django.views.decorators.cache import cache_control
@@ -13,9 +12,8 @@ from student.models import unique_id_for_user
from courseware.courses import get_course_with_access
from controller_query_service import ControllerQueryService
from xmodule.grading_service_module import GradingServiceError
from xmodule.open_ended_grading_classes.grading_service_module import GradingServiceError
import json
from .staff_grading import StaffGrading
from student.models import unique_id_for_user
import open_ended_util