[Checkins] SVN: grok/trunk/src/grok/ Improved context-related error messages.

Sun Oct 15 12:58:50 EDT 2006

Log message for revision 70661:
  Improved context-related error messages.
  Test ambiguous/missing context for template-based views.
  

Changed:
  U   grok/trunk/src/grok/_grok.py
  U   grok/trunk/src/grok/tests/adapter/importedmodel2.py
  U   grok/trunk/src/grok/tests/adapter/multiple.py
  U   grok/trunk/src/grok/tests/adapter/nomodel.py
  A   grok/trunk/src/grok/tests/view/ambiguouscontext.py
  A   grok/trunk/src/grok/tests/view/missingcontext.py

-=-
Modified: grok/trunk/src/grok/_grok.py
===================================================================

--- grok/trunk/src/grok/_grok.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/_grok.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -169,10 +169,10 @@
 
 def check_context(source, context):
     if context is None:
-        raise GrokError("Cannot determine context for %s, please use "
+        raise GrokError("No module-level context for %s, please use "
                         "grok.context." % source)
     elif context is AMBIGUOUS_CONTEXT:
-        raise GrokError("Ambiguous contexts for %s, please use "
+        raise GrokError("Multiple possible contexts for %s, please use "
                         "grok.context." % source)
 
 def determine_context(factory, module_context):

Modified: grok/trunk/src/grok/tests/adapter/importedmodel2.py
===================================================================
--- grok/trunk/src/grok/tests/adapter/importedmodel2.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/tests/adapter/importedmodel2.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -4,7 +4,8 @@
   >>> grok.grok(__name__)
   Traceback (most recent call last):
     ...
-  GrokError: Cannot determine context for <class 'grok.tests.adapter.importedmodel2.Painting'>, please use grok.context.
+  GrokError: No module-level context for
+  <class 'grok.tests.adapter.importedmodel2.Painting'>, please use grok.context.
 
 """
 import grok

Modified: grok/trunk/src/grok/tests/adapter/multiple.py
===================================================================
--- grok/trunk/src/grok/tests/adapter/multiple.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/tests/adapter/multiple.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -4,7 +4,8 @@
   >>> grok.grok(__name__)
   Traceback (most recent call last):
     ...
-  GrokError: Ambiguous contexts for <class 'grok.tests.adapter.multiple.Home'>, please use grok.context.
+  GrokError: Multiple possible contexts for
+  <class 'grok.tests.adapter.multiple.Home'>, please use grok.context.
 
 """
 import grok

Modified: grok/trunk/src/grok/tests/adapter/nomodel.py
===================================================================
--- grok/trunk/src/grok/tests/adapter/nomodel.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/tests/adapter/nomodel.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -4,7 +4,8 @@
   >>> grok.grok(__name__)
   Traceback (most recent call last):
     ...
-  GrokError: Cannot determine context for <class 'grok.tests.adapter.nomodel.Home'>, please use grok.context.
+  GrokError: No module-level context for
+  <class 'grok.tests.adapter.nomodel.Home'>, please use grok.context.
 
 """
 import grok

Added: grok/trunk/src/grok/tests/view/ambiguouscontext.py
===================================================================
--- grok/trunk/src/grok/tests/view/ambiguouscontext.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/tests/view/ambiguouscontext.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -0,0 +1,22 @@
+"""
+Templates with ambiguous context cannot be grokked:
+
+  >>> grok.grok(__name__)
+  Traceback (most recent call last):
+    ...
+  GrokError: Multiple possible contexts for
+  <club template in grok.tests.view.ambiguouscontext>, please use grok.context.
+
+"""
+
+import grok
+
+class Cave(grok.Model):
+    pass
+
+class Mammoth(grok.Model):
+    pass
+
+club = grok.PageTemplate("""\
+<html><body><h1>GROK CLUB MAMMOTH!</h1></body></html>
+""")


Property changes on: grok/trunk/src/grok/tests/view/ambiguouscontext.py
___________________________________________________________________
Name: svn:eol-style
   + native

Added: grok/trunk/src/grok/tests/view/missingcontext.py
===================================================================
--- grok/trunk/src/grok/tests/view/missingcontext.py	2006-10-15 16:48:41 UTC (rev 70660)
+++ grok/trunk/src/grok/tests/view/missingcontext.py	2006-10-15 16:58:49 UTC (rev 70661)
@@ -0,0 +1,16 @@
+"""
+Templates without a context cannot be grokked:
+
+  >>> grok.grok(__name__)
+  Traceback (most recent call last):
+    ...
+  GrokError: No module-level context for
+  <club template in grok.tests.view.missingcontext>, please use grok.context.
+
+"""
+
+import grok
+
+club = grok.PageTemplate("""\
+<html><body><h1>GROK CLUB MAMMOTH!</h1></body></html>
+""")


Property changes on: grok/trunk/src/grok/tests/view/missingcontext.py
___________________________________________________________________
Name: svn:eol-style
   + native

