[Checkins] SVN: martian/branches/jw-philipp-using-ndir-directives/src/martian/ Import and test MultipleTimeDirective.

[Jan-Wijbrand Kolman]

Log message for revision 86200:
  Import and test MultipleTimeDirective.

Changed:
  U   martian/branches/jw-philipp-using-ndir-directives/src/martian/__init__.py
  U   martian/branches/jw-philipp-using-ndir-directives/src/martian/directive.txt

-=-
Modified: martian/branches/jw-philipp-using-ndir-directives/src/martian/__init__.py
===================================================================
--- martian/branches/jw-philipp-using-ndir-directives/src/martian/__init__.py	2008-05-03 12:23:45 UTC (rev 86199)
+++ martian/branches/jw-philipp-using-ndir-directives/src/martian/__init__.py	2008-05-03 12:24:03 UTC (rev 86200)
@@ -3,8 +3,9 @@
     grok_package, grok_module)
 from martian.components import GlobalGrokker, ClassGrokker, InstanceGrokker
 from martian.util import scan_for_classes
-from martian.directive import Directive, MarkerDirective, baseclass
+from martian.directive import Directive, MarkerDirective, MultipleTimesDirective
 from martian.directive import ONCE, MULTIPLE, DICT
 from martian.directive import CLASS, CLASS_OR_MODULE, MODULE
 from martian.directive import (
     validateText, validateInterface, validateInterfaceOrClass)
+from martian.directive import baseclass

Modified: martian/branches/jw-philipp-using-ndir-directives/src/martian/directive.txt
===================================================================
--- martian/branches/jw-philipp-using-ndir-directives/src/martian/directive.txt	2008-05-03 12:23:45 UTC (rev 86199)
+++ martian/branches/jw-philipp-using-ndir-directives/src/martian/directive.txt	2008-05-03 12:24:03 UTC (rev 86200)
@@ -172,10 +172,9 @@
 A directive can be configured to allow it to be called multiple times
 in the same scope::
 
-  >>> from martian import MULTIPLE
-  >>> class multi(Directive):
+  >>> from martian import MultipleTimesDirective
+  >>> class multi(MultipleTimesDirective):
   ...     scope = CLASS
-  ...     store = MULTIPLE
 
 We can now use the directive multiple times without any errors::
 
@@ -188,6 +187,13 @@
   >>> multi.get(Foo)
   [u'Once', u'Twice']
 
+The default value for a MultipleTimesDirective is an empty list::
+
+  >>> class Bar(object):
+  ...   pass
+  >>> multi.get(Bar)
+  []
+
 Using a directive multiple times, as a dictionary
 -------------------------------------------------