[Checkins] SVN: grokcore.view/branches/shared_templates_userwarning/src/grokcore/view/templatereg.py Remove this test, a directory can't be registered twice anymore.

Vincent Fretin vincent.fretin at gmail.com
Mon Aug 3 12:34:23 EDT 2009


Log message for revision 102457:
  Remove this test, a directory can't be registered twice anymore.

Changed:
  U   grokcore.view/branches/shared_templates_userwarning/src/grokcore/view/templatereg.py

-=-
Modified: grokcore.view/branches/shared_templates_userwarning/src/grokcore/view/templatereg.py
===================================================================
--- grokcore.view/branches/shared_templates_userwarning/src/grokcore/view/templatereg.py	2009-08-03 16:23:21 UTC (rev 102456)
+++ grokcore.view/branches/shared_templates_userwarning/src/grokcore/view/templatereg.py	2009-08-03 16:34:22 UTC (rev 102457)
@@ -89,13 +89,10 @@
 
         template_name, extension = os.path.splitext(template_file)
         if (template_dir, template_name) in self._reg:
-            registered_template_path = self._reg.get((template_dir, template_name)).__grok_location__
-            # __grok_location__ is set by _annotateGrokInfo
-            if template_path != registered_template_path:
-                raise GrokError("Conflicting templates found for name '%s' "
-                                "in directory '%s': multiple templates with "
-                                "the same name and different extensions." %
-                                (template_name, template_dir), None)
+            raise GrokError("Conflicting templates found for name '%s' "
+                            "in directory '%s': multiple templates with "
+                            "the same name and different extensions." %
+                            (template_name, template_dir), None)
         # verify no inline template exists with the same name
         try:
             inline_template_registry.lookup(module_info, template_name)



More information about the Checkins mailing list