Fix accidental force push that reset master

Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd4. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.

cms/xmodule_namespace.py

@@ -4,22 +4,8 @@ Namespace defining common fields used by Studio for all blocks
 
 import datetime
 
-from xblock.core import Namespace, Boolean, Scope, ModelType, String
-
-
-class StringyBoolean(Boolean):
-    """
-    Reads strings from JSON as booleans.
-
-    If the string is 'true' (case insensitive), then return True,
-    otherwise False.
-
-    JSON values that aren't strings are returned as is
-    """
-    def from_json(self, value):
-        if isinstance(value, basestring):
-            return value.lower() == 'true'
-        return value
+from xblock.core import Namespace, Scope, ModelType, String
+from xmodule.fields import StringyBoolean
 
 
 class DateTuple(ModelType):

common/lib/xmodule/xmodule/capa_module.py

@@ -16,35 +16,13 @@ from .progress import Progress
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.exceptions import NotFoundError, ProcessingError
-from xblock.core import Integer, Scope, String, Boolean, Object, Float
-from .fields import Timedelta, Date
+from xblock.core import Scope, String, Boolean, Object
+from .fields import Timedelta, Date, StringyInteger, StringyFloat
 from xmodule.util.date_utils import time_to_datetime
 
 log = logging.getLogger("mitx.courseware")
 
 
-class StringyInteger(Integer):
-    """
-    A model type that converts from strings to integers when reading from json
-    """
-    def from_json(self, value):
-        try:
-            return int(value)
-        except:
-            return None
-
-
-class StringyFloat(Float):
-    """
-    A model type that converts from string to floats when reading from json
-    """
-    def from_json(self, value):
-        try:
-            return float(value)
-        except:
-            return None
-
-
 # Generated this many different variants of problems with rerandomize=per_student
 NUM_RANDOMIZATION_BINS = 20
 
@@ -95,7 +73,6 @@ class CapaFields(object):
     input_state = Object(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state)
     student_answers = Object(help="Dictionary with the current student responses", scope=Scope.user_state)
     done = Boolean(help="Whether the student has answered the problem", scope=Scope.user_state)
-    display_name = String(help="Display name for this module", scope=Scope.settings)
     seed = StringyInteger(help="Random seed for this student", scope=Scope.user_state)
     weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
     markdown = String(help="Markdown source of this module", scope=Scope.settings)

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -8,8 +8,7 @@ from .x_module import XModule
 from xblock.core import Integer, Scope, String, Boolean, List
 from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
 from collections import namedtuple
-from .fields import Date
-from xmodule.open_ended_grading_classes.xblock_field_types import StringyFloat
+from .fields import Date, StringyFloat
 
 log = logging.getLogger("mitx.courseware")
 

common/lib/xmodule/xmodule/fields.py

@@ -7,6 +7,8 @@ from xblock.core import ModelType
 import datetime
 import dateutil.parser
 
+from xblock.core import Integer, Float, Boolean
+
 log = logging.getLogger(__name__)
 
 
@@ -81,3 +83,42 @@ class Timedelta(ModelType):
             if cur_value > 0:
                 values.append("%d %s" % (cur_value, attr))
         return ' '.join(values)
+
+
+class StringyInteger(Integer):
+    """
+    A model type that converts from strings to integers when reading from json.
+    If value does not parse as an int, returns None.
+    """
+    def from_json(self, value):
+        try:
+            return int(value)
+        except:
+            return None
+
+
+class StringyFloat(Float):
+    """
+    A model type that converts from string to floats when reading from json.
+    If value does not parse as a float, returns None.
+    """
+    def from_json(self, value):
+        try:
+            return float(value)
+        except:
+            return None
+
+
+class StringyBoolean(Boolean):
+    """
+    Reads strings from JSON as booleans.
+
+    If the string is 'true' (case insensitive), then return True,
+    otherwise False.
+
+    JSON values that aren't strings are returned as-is.
+    """
+    def from_json(self, value):
+        if isinstance(value, basestring):
+            return value.lower() == 'true'
+        return value

common/lib/xmodule/xmodule/open_ended_grading_classes/xblock_field_types.py

-from xblock.core import Integer, Float
-
-
-class StringyFloat(Float):
-    """
-    A model type that converts from string to floats when reading from json
-    """
-
-    def from_json(self, value):
-        try:
-            return float(value)
-        except:
-            return None
-

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -11,8 +11,7 @@ from xmodule.raw_module import RawDescriptor
 from xmodule.modulestore.django import modulestore
 from .timeinfo import TimeInfo
 from xblock.core import Object, Integer, Boolean, String, Scope
-from xmodule.open_ended_grading_classes.xblock_field_types import StringyFloat
-from xmodule.fields import Date
+from xmodule.fields import Date, StringyFloat
 
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService
 from open_ended_grading_classes import combined_open_ended_rubric

common/lib/xmodule/xmodule/tests/test_fields.py

-"""Tests for Date class defined in fields.py."""
+"""Tests for classes defined in fields.py."""
 import datetime
 import unittest
 from django.utils.timezone import UTC
-from xmodule.fields import Date
+from xmodule.fields import Date, StringyFloat, StringyInteger, StringyBoolean
 import time
 
 class DateTest(unittest.TestCase):
@@ -78,3 +78,55 @@ class DateTest(unittest.TestCase):
                 DateTest.date.from_json("2012-12-31T23:00:01-01:00")),
             "2013-01-01T00:00:01Z")
 
+
+class StringyIntegerTest(unittest.TestCase):
+    def assertEquals(self, expected, arg):
+        self.assertEqual(expected, StringyInteger().from_json(arg))
+
+    def test_integer(self):
+        self.assertEquals(5, '5')
+        self.assertEquals(0, '0')
+        self.assertEquals(-1023, '-1023')
+
+    def test_none(self):
+        self.assertEquals(None, None)
+        self.assertEquals(None, 'abc')
+        self.assertEquals(None, '[1]')
+        self.assertEquals(None, '1.023')
+
+
+class StringyFloatTest(unittest.TestCase):
+
+    def assertEquals(self, expected, arg):
+        self.assertEqual(expected, StringyFloat().from_json(arg))
+
+    def test_float(self):
+        self.assertEquals(.23, '.23')
+        self.assertEquals(5, '5')
+        self.assertEquals(0, '0.0')
+        self.assertEquals(-1023.22, '-1023.22')
+
+    def test_none(self):
+        self.assertEquals(None, None)
+        self.assertEquals(None, 'abc')
+        self.assertEquals(None, '[1]')
+
+
+class StringyBooleanTest(unittest.TestCase):
+
+    def assertEquals(self, expected, arg):
+        self.assertEqual(expected, StringyBoolean().from_json(arg))
+
+    def test_false(self):
+        self.assertEquals(False, "false")
+        self.assertEquals(False, "False")
+        self.assertEquals(False, "")
+        self.assertEquals(False, "hahahahah")
+
+    def test_true(self):
+        self.assertEquals(True, "true")
+        self.assertEquals(True, "TruE")
+
+    def test_pass_through(self):
+        self.assertEquals(123, 123)
+

common/lib/xmodule/xmodule/video_module.py

@@ -20,7 +20,6 @@ log = logging.getLogger(__name__)
 class VideoFields(object):
     data = String(help="XML data for the problem", scope=Scope.content)
     position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
-    display_name = String(help="Display name for this module", scope=Scope.settings)
 
 
 class VideoModule(VideoFields, XModule):

lms/xmodule_namespace.py

 """
 Namespace that defines fields common to all blocks used in the LMS
 """
-from xblock.core import Namespace, Boolean, Scope, String, Float
-from xmodule.fields import Date, Timedelta
-
-
-class StringyBoolean(Boolean):
-    """
-    Reads strings from JSON as booleans.
-
-    'true' (case insensitive) return True, other strings return False
-    Other types are returned unchanged
-    """
-    def from_json(self, value):
-        if isinstance(value, basestring):
-            return value.lower() == 'true'
-        return value
-
-
-class StringyFloat(Float):
-    """
-    Reads values as floats. If the value parses as a float, returns
-    that, otherwise returns None
-    """
-    def from_json(self, value):
-        try:
-            return float(value)
-        except:
-            return None
+from xblock.core import Namespace, Boolean, Scope, String
+from xmodule.fields import Date, Timedelta, StringyFloat, StringyBoolean
 
 
 class LmsNamespace(Namespace):