From 5e0f0be1be3513db6e4b0617bf9b08a98415e95b Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 24 Sep 2012 11:48:44 -0400
Subject: [PATCH] Fix up ErrorDescriptor._construct, and use in in
 ErrorDescriptor.from_json

---
 common/lib/xmodule/xmodule/error_module.py         | 4 ++--
 common/lib/xmodule/xmodule/modulestore/__init__.py | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py
index 220d818a7a..65fceb77c7 100644
--- a/common/lib/xmodule/xmodule/error_module.py
+++ b/common/lib/xmodule/xmodule/error_module.py
@@ -75,7 +75,7 @@ class ErrorDescriptor(JSONEditingDescriptor):
 
         # real metadata stays in the content, but add a display name
         metadata = {'display_name': 'Error: ' + location.name}
-        super(ErrorDescriptor, self).__init__(
+        return ErrorDescriptor(
             system,
             definition,
             location=location,
@@ -90,7 +90,7 @@ class ErrorDescriptor(JSONEditingDescriptor):
 
     @classmethod
     def from_json(cls, json_data, system, error_msg='Error not available'):
-        return cls(
+        return cls._construct(
             system,
             json.dumps(json_data, indent=4),
             error_msg,
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 3d7923bd60..fa8cf8d3d7 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -101,8 +101,6 @@ class Location(_LocationBase):
                 raise InsufficientSpecificationError(location)
         return loc
 
-
-
     def __new__(_cls, loc_or_tag=None, org=None, course=None, category=None,
                 name=None, revision=None):
         """