Issue #25: __model_cls__ attribute for contexts' class, __model__ for instance of this class.

Author: boonya

domain_models/views.py

@@ -5,20 +5,20 @@
 class ContextView(object):
     """Contextual view class."""
 
-    __model__ = None
+    __model_cls__ = None
 
     def __init__(self, model):
         """Model validation.
 
         :param model: DomainModel
         """
-        if not issubclass(self.__model__, models.DomainModel):
+        if not issubclass(self.__model_cls__, models.DomainModel):
             raise TypeError("Attribute __model__ must be subclass of "
                             "DomainModel")
 
-        if not isinstance(model, self.__model__):
+        if not isinstance(model, self.__model_cls__):
             raise TypeError("\"{0}\" is not an instance of {1}".format(
-                model, self.__model__))
+                model, self.__model_cls__))
 
         self.__model__ = model
 

tests/test_context_view.py

@@ -30,7 +30,7 @@ class Profile(models.DomainModel):
 
 class PublicProfile(views.ContextView):
     """Profile data in public context."""
-    __model__ = Profile
+    __model_cls__ = Profile
 
     def _get_oid(self):
         """Calculate open id.
@@ -60,7 +60,7 @@ def get_data(self):
 
 class PrivateProfile(views.ContextView):
     """Profile data in private context."""
-    __model__ = Profile
+    __model_cls__ = Profile
 
     def _get_photos(self):
         photos = []
@@ -85,7 +85,7 @@ def get_data(self):
 
 class PublicPhoto(views.ContextView):
     """Photo data in public context."""
-    __model__ = Photo
+    __model_cls__ = Photo
 
     def _get_oid(self):
         return self.__model__.id << 8
@@ -101,7 +101,7 @@ def get_data(self):
 
 
 class PrivatePhoto(views.ContextView):
-    __model__ = Photo
+    __model_cls__ = Photo
 
     def get_data(self):
         return {
@@ -120,15 +120,15 @@ def get_data(self):
 
 class WrongModelContext(views.ContextView):
     """Wrong model defined."""
-    __model__ = type
+    __model_cls__ = type
 
     def get_data(self):
         pass
 
 
 class GetterUndefinedContext(views.ContextView):
     """Getter undefined."""
-    __model__ = Profile
+    __model_cls__ = Profile
 
 
 class TestContextView(unittest.TestCase):