Merge branch 'master' of github.com:Pylons/Kotti

Conflicts:
	kotti/resources.py

Author: dnouri

.coveragerc

@@ -1,2 +1,4 @@
 [run]
-omit = *test*py
+omit =
+  *test*py
+  kotti/alembic/*

.gitignore

@@ -18,3 +18,4 @@ junit*.xml
 .tox
 *~
 *.swp
+.cache

docs/api/index.rst

@@ -10,6 +10,12 @@ API Documentation
 .. automodule:: kotti.events
    :members:
 
+:mod:`kotti.interfaces`
+-----------------------
+
+.. automodule:: kotti.interfaces
+   :members:
+
 :mod:`kotti.message`
 --------------------
 

docs/conf.py

@@ -28,6 +28,8 @@
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.viewcode',
+    'sphinx.ext.inheritance_diagram',
+    'sphinx.ext.graphviz',
     ]
 
 # Add any paths that contain templates here, relative to this directory.

kotti/events.py

@@ -28,6 +28,12 @@ def document_insert_handler(event):
 
 Listeners are generally called in the order in which they are
 registered.
+
+Inheritance Diagram
+-------------------
+
+.. inheritance-diagram:: kotti.events
+
 """
 
 from collections import defaultdict

kotti/interfaces.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+"""
+
+Inheritance Diagram
+-------------------
+
+.. inheritance-diagram:: kotti.interfaces
+"""
+
+from zope.interface import Interface
+
+
+class INode(Interface):
+    """Marker interface for all nodes (and subclasses)"""
+
+    pass
+
+
+class IContent(INode):
+    """Marker interface for all nodes of type Content
+       (and subclasses thereof)"""
+
+    pass
+
+
+class IDocument(IContent):
+    """Marker interface for all nodes of type Document
+       (and subclasses thereof)"""
+
+    pass
+
+
+class IFile(IContent):
+    """Marker interface for all nodes of type File
+       (and subclasses thereof)"""
+
+    pass
+
+
+class IImage(IFile):
+    """Marker interface for all nodes of type Image
+       (and subclasses thereof)"""
+
+    pass
+
+
+class IDefaultWorkflow(Interface):
+    """Marker interface for content classes that want to use the
+       default workflow"""
+
+    pass