ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3221 from normanjaeckel/ChangeKeyError

Browse Source 
Fixed error for internal function get_model_from_collection_string.
This commit is contained in:
Emanuel Schütze 2017-04-27 15:34:39 +02:00 committed by GitHub
commit dd99be5e69
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/utils/collection.py
View File

@ -506,8 +506,11 @@ def get_model_from_collection_string(collection_string):
pass pass
else: else:
_models_to_collection_string[get_collection_string()] = model _models_to_collection_string[get_collection_string()] = model
try:
return _models_to_collection_string[collection_string] model = _models_to_collection_string[collection_string]
except KeyError:
raise ValueError('Invalid message. A valid collection_string is missing.')
return model
def get_single_element_cache_key(collection_string, id): def get_single_element_cache_key(collection_string, id):

2
tests/unit/utils/test_collection.py
View File

@ -58,7 +58,7 @@ class TestGetModelFromCollectionString(TestCase):
self.assertEqual(projector_model, Projector) self.assertEqual(projector_model, Projector)
def test_unknown_app(self): def test_unknown_app(self):
with self.assertRaises(KeyError): with self.assertRaises(ValueError):
collection.get_model_from_collection_string('invalid/model') collection.get_model_from_collection_string('invalid/model')