[Checkins] SVN: megrok.layout/trunk/src/megrok/layout/tests/ Pep8 cleaning
Souheil CHELFOUH
souheil at chelfouh.com
Mon Oct 18 05:59:47 EDT 2010
Log message for revision 117666:
Pep8 cleaning
Changed:
U megrok.layout/trunk/src/megrok/layout/tests/__init__.py
U megrok.layout/trunk/src/megrok/layout/tests/errors/norenderortemplatelayout.py
U megrok.layout/trunk/src/megrok/layout/tests/errors/renderandtemplate.py
U megrok.layout/trunk/src/megrok/layout/tests/errors/samecontext.py
U megrok.layout/trunk/src/megrok/layout/tests/layout/layout.py
U megrok.layout/trunk/src/megrok/layout/tests/layout/layoutlayers.py
U megrok.layout/trunk/src/megrok/layout/tests/layout/specializedlayout.py
U megrok.layout/trunk/src/megrok/layout/tests/models/forms.py
U megrok.layout/trunk/src/megrok/layout/tests/models/message.py
U megrok.layout/trunk/src/megrok/layout/tests/models/page.py
U megrok.layout/trunk/src/megrok/layout/tests/test_readme.py
-=-
Modified: megrok.layout/trunk/src/megrok/layout/tests/__init__.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/__init__.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/__init__.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -1,39 +1,34 @@
# -*- coding: utf-8 -*-
import zope.component
+from grokcore.component import zcml
from zope.component.interfaces import IComponentLookup
from zope.component.testlayer import ZCMLFileLayer
-from zope.container import btree
+from zope.configuration.config import ConfigurationMachine
from zope.container.interfaces import ISimpleReadContainer
from zope.container.traversal import ContainerTraversable
from zope.interface import Interface
+from zope.publisher.interfaces import IRequest
+from zope.session.http import CookieClientIdManager
+from zope.session.interfaces import IClientId, IClientIdManager, ISession
+from zope.session.interfaces import ISessionDataContainer
+from zope.session.session import ClientId, Session
+from zope.session.session import PersistentSessionDataContainer
from zope.site.folder import rootFolder
from zope.site.site import LocalSiteManager, SiteManagerAdapter
from zope.traversing.interfaces import ITraversable
from zope.traversing.testing import setUp as traversingSetUp
-from zope.configuration.config import ConfigurationMachine
-from grokcore.component import zcml
-from zope.component import provideHandler, getGlobalSiteManager
-from zope.session.interfaces import IClientId, IClientIdManager, ISession
-from zope.session.interfaces import ISessionDataContainer
-from zope.session.interfaces import ISessionPkgData, ISessionData
-from zope.session.session import ClientId, Session
-from zope.session.session import PersistentSessionDataContainer
-from zope.session.session import RAMSessionDataContainer
-from zope.session.http import CookieClientIdManager
-from zope.publisher.interfaces import IRequest
-
class MegrokLayoutLayer(ZCMLFileLayer):
-
+
def setUp(self):
ZCMLFileLayer.setUp(self)
-
+
# Set up site manager adapter
zope.component.provideAdapter(
SiteManagerAdapter, (Interface,), IComponentLookup)
-
+
# Set up traversal
traversingSetUp()
zope.component.provideAdapter(
@@ -42,17 +37,17 @@
# Session
zope.component.provideAdapter(ClientId, (IRequest,), IClientId)
zope.component.provideAdapter(Session, (IRequest,), ISession)
- zope.component.provideUtility(CookieClientIdManager(), IClientIdManager)
+ zope.component.provideUtility(
+ CookieClientIdManager(), IClientIdManager)
sdc = PersistentSessionDataContainer()
zope.component.provideUtility(sdc, ISessionDataContainer, '')
-
+
# Set up site
site = rootFolder()
site.setSiteManager(LocalSiteManager(site))
zope.component.hooks.setSite(site)
-
+
return site
-
def tearDown(self):
ZCMLFileLayer.tearDown(self)
Modified: megrok.layout/trunk/src/megrok/layout/tests/errors/norenderortemplatelayout.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/errors/norenderortemplatelayout.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/errors/norenderortemplatelayout.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -8,7 +8,6 @@
"""
import grokcore.component as grok
-from grokcore.view import View
from megrok.layout import Layout
from zope.interface import Interface
Modified: megrok.layout/trunk/src/megrok/layout/tests/errors/renderandtemplate.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/errors/renderandtemplate.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/errors/renderandtemplate.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -8,7 +8,6 @@
"""
import grokcore.component as grok
-from grokcore.view import View
from megrok.layout import Layout
from zope.interface import Interface
Modified: megrok.layout/trunk/src/megrok/layout/tests/errors/samecontext.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/errors/samecontext.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/errors/samecontext.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -1,5 +1,5 @@
"""
- >>> grok.testing.grok(__name__)
+ >>> grok.testing.grok(__name__)
Traceback (most recent call last):
...
ConfigurationConflictError: Conflicting configuration actions
Modified: megrok.layout/trunk/src/megrok/layout/tests/layout/layout.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/layout/layout.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/layout/layout.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -21,7 +21,7 @@
"""
import grokcore.component as grok
-from zope import interface
+from zope.interface import Interface
from megrok.layout import Layout
@@ -34,14 +34,14 @@
class MyLayout(Layout):
- grok.context(interface.Interface)
+ grok.context(Interface)
def render(self):
- return "<div> MyLayout </div>"
+ return "<div> MyLayout </div>"
class MyContextLayout(Layout):
grok.context(Elephant)
def render(self):
- return "<div> MyContextLayout </div>"
+ return "<div> MyContextLayout </div>"
Modified: megrok.layout/trunk/src/megrok/layout/tests/layout/layoutlayers.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/layout/layoutlayers.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/layout/layoutlayers.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -49,7 +49,7 @@
grok.layer(IDefaultLayer)
def render(self):
- return "A Layout"
+ return "A Layout"
class A2Layout(Layout):
@@ -57,7 +57,7 @@
grok.layer(IAnotherLayer)
def render(self):
- return "A2 Layout"
+ return "A2 Layout"
class BLayout(Layout):
@@ -65,7 +65,7 @@
grok.layer(IAnotherLayer)
def render(self):
- return "B Layout"
+ return "B Layout"
class MyView(Page):
Modified: megrok.layout/trunk/src/megrok/layout/tests/layout/specializedlayout.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/layout/specializedlayout.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/layout/specializedlayout.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -29,7 +29,7 @@
>>> view = getMultiAdapter((two, request), name="myview")
>>> print view()
Layout B for context Two
-
+
"""
import grokcore.view as grok
from zope.interface import Interface
@@ -58,7 +58,7 @@
grok.layer(IALayer)
def render(self):
- return "Layout A for context One"
+ return "Layout A for context One"
class ATwoLayout(Layout):
@@ -66,7 +66,7 @@
grok.layer(IALayer)
def render(self):
- return "Layout A for context Two"
+ return "Layout A for context Two"
class BOneLayout(Layout):
@@ -74,7 +74,7 @@
grok.layer(IBLayer)
def render(self):
- return "Layout B for context One"
+ return "Layout B for context One"
class BTwoLayout(Layout):
@@ -82,7 +82,7 @@
grok.layer(IBLayer)
def render(self):
- return "Layout B for context Two"
+ return "Layout B for context Two"
class MyView(Page):
Modified: megrok.layout/trunk/src/megrok/layout/tests/models/forms.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/models/forms.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/models/forms.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -5,7 +5,7 @@
>>> cow = Cow()
>>> request = TestRequest()
-
+
>>> mylayout = getMultiAdapter((request, cow), ILayout)
Display form:
Modified: megrok.layout/trunk/src/megrok/layout/tests/models/message.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/models/message.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/models/message.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -2,7 +2,7 @@
>>> from megrok.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
-
+
>>> kitty = Cat()
>>> request = TestRequest()
>>> mylayout = getMultiAdapter((request, kitty), ILayout)
@@ -27,15 +27,14 @@
>>> print ", ".join([msg.message for msg in messages])
test
-
+
>>> from zope.security.management import endInteraction
>>> endInteraction()
"""
import grokcore.component as grok
from grokcore.view import templatedir
-
-from zope import interface
+from zope.interface import Interface
from megrok.layout import Layout, Page
templatedir('templates')
@@ -51,7 +50,7 @@
class Utils(Page):
- grok.context(interface.Interface)
+ grok.context(Interface)
def render(self):
- return "<p>A purring cat</p>"
+ return "<p>A purring cat</p>"
Modified: megrok.layout/trunk/src/megrok/layout/tests/models/page.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/models/page.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/models/page.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -45,4 +45,4 @@
grok.context(interface.Interface)
def render(self):
- return "<p> My nice Content </p>"
+ return "<p> My nice Content </p>"
Modified: megrok.layout/trunk/src/megrok/layout/tests/test_readme.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/test_readme.py 2010-10-18 09:59:41 UTC (rev 117665)
+++ megrok.layout/trunk/src/megrok/layout/tests/test_readme.py 2010-10-18 09:59:47 UTC (rev 117666)
@@ -17,7 +17,6 @@
def test_suite():
-
optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
globs = {'grok_component': grok_component, '__name__': 'megrok.layout'}
suite = unittest.TestSuite()
@@ -28,8 +27,6 @@
optionflags=optionflags,
setUp=moduleSetUp,
tearDown=moduleTearDown,
- globs=globs),
- )
- layer = megrok.layout.tests.MegrokLayoutLayer(megrok.layout.tests)
+ globs=globs))
return suite
More information about the checkins
mailing list