From bda46c423d110529e7b6e7e9ab043590fcdec1ec Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Fri, 8 Feb 2013 10:41:02 -0500
Subject: [PATCH] Fix some issues that were prevent lms start

---
 .../xmodule/combined_open_ended_module.py     | 12 -----------
 .../xmodule/combined_open_ended_modulev1.py   | 15 ++------------
 common/lib/xmodule/xmodule/openendedchild.py  | 20 +------------------
 .../xmodule/xmodule/peer_grading_module.py    |  2 +-
 lms/xmodule_namespace.py                      |  2 +-
 5 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 2da15a4086..3e1a622da3 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -1,24 +1,12 @@
-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
 
 log = logging.getLogger("mitx.courseware")
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
index 8bd7df86c1..5775c42ce3 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
@@ -1,31 +1,20 @@
-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 self_assessment_module
 import open_ended_module
-from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
-from .stringify import stringify_children
+from combined_open_ended_rubric import CombinedOpenEndedRubric
 import dateutil
 import dateutil.parser
-import datetime
 from timeparse import parse_timedelta
 
 log = logging.getLogger("mitx.courseware")
diff --git a/common/lib/xmodule/xmodule/openendedchild.py b/common/lib/xmodule/xmodule/openendedchild.py
index ba2de5c930..9111aa96a7 100644
--- a/common/lib/xmodule/xmodule/openendedchild.py
+++ b/common/lib/xmodule/xmodule/openendedchild.py
@@ -1,27 +1,9 @@
-import copy
-from fs.errors import ResourceNotFoundError
-import itertools
 import json
 import logging
-from lxml import etree
-from lxml.html import rewrite_links
 from lxml.html.clean import Cleaner, autolink_html
-from path import path
-import os
-import sys
-import hashlib
-import capa.xqueue_interface as xqueue_interface
 import re
 
-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 .xml_module import XmlDescriptor
-from xmodule.modulestore import Location
 from capa.util import *
 import open_ended_image_submission
 
@@ -74,7 +56,7 @@ class OpenEndedChild(object):
         'done': 'Problem complete',
     }
 
-    def __init__(self, system, location, definition, descriptor, static_data, 
+    def __init__(self, system, location, definition, descriptor, static_data,
                  instance_state=None, shared_state=None, **kwargs):
         # Load instance state
         if instance_state is not None:
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 20f71f3b3c..40ebf97fbe 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -24,7 +24,7 @@ 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
diff --git a/lms/xmodule_namespace.py b/lms/xmodule_namespace.py
index 268e273c36..ef5afe4608 100644
--- a/lms/xmodule_namespace.py
+++ b/lms/xmodule_namespace.py
@@ -1,4 +1,4 @@
-from xblock.core import Namespace, Boolean, Scope, String, List
+from xblock.core import Namespace, Boolean, Scope, String, List, Float
 from xmodule.fields import Date, Timedelta