In fact, lets hold off on merging this PR until we've got the HF through
and merged into master (since that'll shrink the changes in this PR
significantly).

-Cale


On Wed, Jul 17, 2013 at 1:16 PM, Calen Pennington <cale@edx.org> wrote:

> Let's do it in this PR, but the HF will go through as is.
>
> -Cale
>
>
> On Wed, Jul 17, 2013 at 1:06 PM, chrisndodge <notifications@github.com>wrote:
>
>> In common/lib/xmodule/xmodule/video_module.py:
>>
>> > @@ -128,6 +128,13 @@ def from_xml(cls, xml_data, system, org=None, course=None):
>> >          _parse_video_xml(video, xml_data)
>> >          return video
>> >
>> > +    def definition_to_xml(self, resource_fs):
>> > +        """
>> > +        Override the base implementation. We don't actually have anything in the 'data' field
>> > +        (it's an empty string), so we just return a simple XML element
>> > +        """
>> > +        return etree.fromstring('<video />')
>>
>> sure thing. Can I do this post merge?
>>
>> —
>> Reply to this email directly or view it on GitHub<https://github.com/edx/edx-platform/pull/413/files#r5247592>
>> .
>>
>
>