From 4ae711c421a8a013c0890cf1f972504ed9c4f763 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 2 Jul 2012 08:54:23 -0400
Subject: [PATCH] Clarify from_json arguments

---
 common/lib/xmodule/x_module.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/x_module.py b/common/lib/xmodule/x_module.py
index 68f381a755f..35cde8b6f4e 100644
--- a/common/lib/xmodule/x_module.py
+++ b/common/lib/xmodule/x_module.py
@@ -263,7 +263,8 @@ class XModuleDescriptor(Plugin):
         Creates an instance of this descriptor from the supplied json_data.
         This may be overridden by subclasses
 
-        json_data: Json data specifying the data, children, and metadata for the descriptor
+        json_data: A json object specifying the definition and any optional keyword arguments for
+            the XModuleDescriptor
         system: An XModuleSystem for interacting with external resources
         """
         return cls(system=system, **json_data)
-- 
GitLab