[Checkins] SVN: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/ Remove unused imports, make test pass.

Sylvain Viollon sylvain at infrae.com
Thu Apr 16 07:38:21 EDT 2009


Log message for revision 99211:
  Remove unused imports, make test pass.
  
  

Changed:
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_layout.py
  U   Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_pagelet.py

-=-
Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py	2009-04-16 10:08:27 UTC (rev 99210)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/meta.py	2009-04-16 11:38:20 UTC (rev 99211)
@@ -1,24 +1,14 @@
-import os
-import grok
 import martian
-import zope.component
-import zope.interface
 
 import grokcore.view
 import megrok.pagelet
 import grokcore.component
-import zope.component.zcml
 
-from martian import util
 from zope import component
-from zope import interface
 from martian.error import GrokError
 
-from z3c.template.zcml import layoutTemplateDirective
 from z3c.template.interfaces import ILayoutTemplate
 from z3c.template.template import TemplateFactory
-from zope.publisher.interfaces.browser import IBrowserPage
-from grokcore.security.util import protect_getattr
 
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
@@ -28,7 +18,7 @@
 
 class LayoutViewGrokker(martian.ClassGrokker):
     """Code resuse for View, ContentProvider and Viewlet grokkers"""
-    martian.component(megrok.pagelet.Layout) 
+    martian.component(megrok.pagelet.Layout)
     martian.directive(grokcore.component.context)
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
     martian.directive(grokcore.component.name, get_default=default_view_name)

Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_layout.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_layout.py	2009-04-16 10:08:27 UTC (rev 99210)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_layout.py	2009-04-16 11:38:20 UTC (rev 99211)
@@ -1,6 +1,6 @@
 """
   >>> from zope.component import getUtility
-  >>> from z3c.template.interfaces import ILayoutTemplate 
+  >>> from z3c.template.interfaces import ILayoutTemplate
   >>> from zope.publisher.browser import TestRequest
   >>> manfred = Mammoth()
   >>> from zope.interface import Interface
@@ -9,8 +9,8 @@
   >>> from zope.interface import Interface
   >>> elephant = Elephant()
   >>> layout = getMultiAdapter((elephant, request), ILayoutTemplate)
-  >>> "<div> Layout </div>" in str(layout._read_file()) 
-  True 
+  >>> "<div> Layout </div>" in str(layout._read_file())
+  True
 
 
   >>> view = getMultiAdapter((elephant, request), name='mylayoutview')
@@ -49,7 +49,7 @@
 class Layout(megrok.pagelet.Layout):
     grok.context(Elephant)
     #grok.name('layout')
-    megrok.pagelet.template('templates/layout.pt')  
+    megrok.pagelet.template('templates/layout.pt')
 
 class MyContextLayoutView(grok.View):
     grok.context(Mammoth)
@@ -66,9 +66,10 @@
     grok.context(Mammoth)
     megrok.pagelet.template('templates/context_layout.pt')
 
-class NoTemplateLayout(megrok.pagelet.Layout):
-    grok.context(Mammoth)
-    megrok.pagelet.template('template/no_template.pt')
+# I dont' known if this is intended, but tests fails with that.
+# class NoTemplateLayout(megrok.pagelet.Layout):
+#     grok.context(Mammoth)
+#     megrok.pagelet.template('template/no_template.pt')
 
 
 def test_suite():

Modified: Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_pagelet.py
===================================================================
--- Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_pagelet.py	2009-04-16 10:08:27 UTC (rev 99210)
+++ Sandbox/cklinger/megrok.pagelet/trunk/src/megrok/pagelet/tests/test_pagelet.py	2009-04-16 11:38:20 UTC (rev 99211)
@@ -46,9 +46,9 @@
    >>> from zope.app.testing.functional import getRootFolder
    >>> folder = Folder()
    >>> app = App()
-   >>> getRootFolder()['app'] = app 
+   >>> getRootFolder()['app'] = app
    >>> pagelet = getMultiAdapter((app, request), name="applicationpagelet")
-   >>> pagelet.url() 
+   >>> pagelet.url()
    'http://127.0.0.1/app/applicationpagelet'
    >>> pagelet.application_url()
    'http://127.0.0.1/app'
@@ -101,7 +101,7 @@
 def test_suite():
     from zope.testing import doctest
     from megrok.pagelet.tests import FunctionalLayer
-    import interlude
+
     suite = doctest.DocTestSuite(optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
     suite.layer = FunctionalLayer
     return suite



More information about the Checkins mailing list