Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7789 from cpennington/wrap-csm

Browse Source 
Wrap access to CSM (inside FieldDataCache) to use the new interface
This commit is contained in:
Calen Pennington
2015-05-20 16:11:07 -04:00
parent af69635f74 122039ac58
commit a2cbd16680
17 changed files with 1571 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View File

@@ -120,7 +120,10 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
elif key.scope == Scope.content:
return self._data[key.field_name]
else:
raise InvalidScopeError(key)
raise InvalidScopeError(
key,
(Scope.children, Scope.parent, Scope.settings, Scope.content),
)
def set(self, key, value):
if key.scope == Scope.children:
@@ -130,7 +133,10 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
elif key.scope == Scope.content:
self._data[key.field_name] = value
else:
raise InvalidScopeError(key)
raise InvalidScopeError(
key,
(Scope.children, Scope.settings, Scope.content),
)
def delete(self, key):
if key.scope == Scope.children:
@@ -142,7 +148,10 @@ class MongoKeyValueStore(InheritanceKeyValueStore):
if key.field_name in self._data:
del self._data[key.field_name]
else:
raise InvalidScopeError(key)
raise InvalidScopeError(
key,
(Scope.children, Scope.settings, Scope.content),
)
def has(self, key):
if key.scope in (Scope.children, Scope.parent):

12
common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py
View File

@@ -18,6 +18,8 @@ class SplitMongoKVS(InheritanceKeyValueStore):
known to the MongoModuleStore (data, children, and metadata)
"""
VALID_SCOPES = (Scope.parent, Scope.children, Scope.settings, Scope.content)
@contract(parent="BlockUsageLocator | None")
def __init__(self, definition, initial_values, default_values, parent, field_decorator=None):
"""
@@ -59,7 +61,7 @@ class SplitMongoKVS(InheritanceKeyValueStore):
else:
raise KeyError()
else:
raise InvalidScopeError(key)
raise InvalidScopeError(key, self.VALID_SCOPES)
if key.field_name in self._fields:
field_value = self._fields[key.field_name]
@@ -71,8 +73,8 @@ class SplitMongoKVS(InheritanceKeyValueStore):
def set(self, key, value):
# handle any special cases
if key.scope not in [Scope.children, Scope.settings, Scope.content]:
raise InvalidScopeError(key)
if key.scope not in self.VALID_SCOPES:
raise InvalidScopeError(key, self.VALID_SCOPES)
if key.scope == Scope.content:
self._load_definition()
@@ -90,8 +92,8 @@ class SplitMongoKVS(InheritanceKeyValueStore):
def delete(self, key):
# handle any special cases
if key.scope not in [Scope.children, Scope.settings, Scope.content]:
raise InvalidScopeError(key)
if key.scope not in self.VALID_SCOPES:
raise InvalidScopeError(key, self.VALID_SCOPES)
if key.scope == Scope.content:
self._load_definition()