[Checkins] SVN: megrok.layout/trunk/ add a valid gitignore file
Souheil CHELFOUH
souheil at chelfouh.com
Mon Oct 18 05:57:29 EDT 2010
Log message for revision 117642:
add a valid gitignore file
Changed:
U megrok.layout/trunk/.gitignore
U megrok.layout/trunk/buildout.cfg
U megrok.layout/trunk/setup.py
U megrok.layout/trunk/src/megrok/__init__.pyc
U megrok.layout/trunk/src/megrok/layout/__init__.pyc
U megrok.layout/trunk/src/megrok/layout/components.pyc
U megrok.layout/trunk/src/megrok/layout/ftesting.zcml
U megrok.layout/trunk/src/megrok/layout/ftests/__init__.pyc
U megrok.layout/trunk/src/megrok/layout/ftests/test_general.pyc
U megrok.layout/trunk/src/megrok/layout/ftests/test_layout.pyc
U megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.py
U megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.pyc
U megrok.layout/trunk/src/megrok/layout/ftests/test_page.pyc
U megrok.layout/trunk/src/megrok/layout/ftests/test_static.py
U megrok.layout/trunk/src/megrok/layout/ftests/test_static.pyc
U megrok.layout/trunk/src/megrok/layout/interfaces.pyc
U megrok.layout/trunk/src/megrok/layout/meta.py
U megrok.layout/trunk/src/megrok/layout/meta.pyc
U megrok.layout/trunk/src/megrok/layout/meta.zcml
U megrok.layout/trunk/src/megrok/layout/testing.pyc
U megrok.layout/trunk/src/megrok/layout/tests/__init__.pyc
D megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.py
D megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.pyc
U megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.pyc
-=-
Modified: megrok.layout/trunk/.gitignore
===================================================================
--- megrok.layout/trunk/.gitignore 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/.gitignore 2010-10-18 09:57:29 UTC (rev 117642)
@@ -0,0 +1,32 @@
+# This is the repository-wide ignore file. Suffixes below are ignored
+# i.e. committing not allowed.
+
+# archives
+*.tar
+*.tar.gz
+*.tar.bz2
+*.zip
+
+# editors
+*.swp
+*.elc
+*.el
+*~
+*\#*\#
+
+# python
+*.pyc
+*.pyo
+*.bdf
+*.bak
+build/
+dist/
+
+
+# miscellaneous
+*.orig
+*.ori
+*.old
+*.svn
+*.rej
+*.egg-info
Modified: megrok.layout/trunk/buildout.cfg
===================================================================
--- megrok.layout/trunk/buildout.cfg 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/buildout.cfg 2010-10-18 09:57:29 UTC (rev 117642)
@@ -12,5 +12,5 @@
[test]
recipe = zc.recipe.testrunner
eggs = megrok.layout
-defaults = ['--tests-pattern', '^f?tests$', '-v', '--package=megrok.layout']
+defaults = ['--tests-pattern', '^f?tests$', '-v', '-c', '--package=megrok.layout']
Modified: megrok.layout/trunk/setup.py
===================================================================
--- megrok.layout/trunk/setup.py 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/setup.py 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,9 +1,9 @@
from setuptools import setup, find_packages
import os
-long_description = open('README.txt').read() +
- '\n\n' +
- open(os.path.join('docs', 'HISTORY.txt').read())
+long_description = open('README.txt').read() + \
+ '\n\n' + \
+ open(os.path.join('docs', 'HISTORY.txt')).read()
@@ -31,6 +31,7 @@
zip_safe=False,
install_requires=[
'setuptools',
+ 'grokcore.component',
'grokcore.view',
'grokcore.formlib',
# -*- Extra requirements: -*-
Modified: megrok.layout/trunk/src/megrok/__init__.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/__init__.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/__init__.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-‹ÉDJc @ sP y e d ƒ i e ƒ Wn2 e j
+—)®Jc @ sP y e d ƒ i e ƒ Wn2 e j
o& d d k l Z e e e ƒ Z n Xd S( t
pkg_resourcesiÿÿÿÿ( t extend_pathN( t
- __import__t declare_namespacet __name__t ImportErrort pkgutilR t __path__( ( ( s7 /Users/cklinger/megrok/megrok.layout/megrok/__init__.pys <module> s
\ No newline at end of file
+ __import__t declare_namespacet __name__t ImportErrort pkgutilR t __path__( ( ( s@ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/__init__.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/__init__.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/__init__.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/__init__.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,2 +1,2 @@
³ò
-‹ÉDJc @ s6 d d k l Z l Z d d k l Z l Z l Z d S( iÿÿÿÿ( t ILayoutt IPage( t Layoutt Paget FormN( t megrok.layout.interfacesR R t megrok.layout.componentsR R R ( ( ( s> /Users/cklinger/megrok/megrok.layout/megrok/layout/__init__.pys <module> s
\ No newline at end of file
+—)®Jc @ s6 d d k l Z l Z d d k l Z l Z l Z d S( iÿÿÿÿ( t ILayoutt IPage( t Layoutt Paget FormN( t megrok.layout.interfacesR R t megrok.layout.componentsR R R ( ( ( sG /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/__init__.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/components.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/components.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/components.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-í+OJc
+—)®Jc
@ s» d d k Z d d k Z d d k Z d d k i Z d d k l Z d d k
l Z d d k l
Z
@@ -9,45 +9,45 @@
d „ Z e e _ d „ Z RS( s A layout object.
c C sl | | _ | | _ d | _ t | d d ƒ d j o+ t i i | i t d | i i
ƒ| _ n
- d | _ d S( Nt module_infot name( t contextt requestt Nonet viewt getattrt zopet componentt queryAdapterR R t package_dotted_namet static( t selfR R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt __init__ s c C sH h } | i | d <| | d <| i | d <| i | d <| i | d <| S( NR
+ d | _ d S( Nt module_infot name( t contextt requestt Nonet viewt getattrt zopet componentt queryAdapterR R t package_dotted_namet static( t selfR R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt __init__ s c C sH h } | i | d <| | d <| i | d <| i | d <| i | d <| S( NR
t layoutR R R ( R
- R R R ( R t namespace( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt default_namespace s
+ R R R ( R t namespace( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt default_namespace s
-c C s h S( N( ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR ( s c C s d S( N( ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt update+ s c C s
- | i i S( N( R t response( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR . s c C s | i i | ƒ S( N( t templatet render( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt _render_template2 s c C s
- | i ƒ S( N( R ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR 5 s c C s | | _ | i ƒ | i ƒ S( N( R
+c C s h S( N( ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR ( s c C s d S( N( ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt update+ s c C s
+ | i i S( N( R t response( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR . s c C s | i i | ƒ S( N( t templatet render( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt _render_template2 s c C s
+ | i ƒ S( N( R ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR 5 s c C s | | _ | i ƒ | i ƒ S( N( R
R R ( R R
- ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt __call__: s
+ ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt __call__: s
( t __name__t
__module__t __doc__t grokt baseclasst
- implementsR R R R R t propertyR R R t Truet base_methodR ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR s
+ implementsR R R R R t propertyR R R t Truet base_methodR ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR s
t Pagec B sg e Z d Z e i ƒ e i e ƒ d Z d „ Z d „ Z
d „ Z e e _
e d „ ƒ Z d „ Z RS( s A view class.
- c C s& t t | ƒ i | | ƒ d | _ d S( N( t superR% R R R ( R R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR H s c C s& t t | ƒ i ƒ } | i | d <| S( NR ( R& R% R R ( R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR L s
+ c C s& t t | ƒ i | | ƒ d | _ d S( N( t superR% R R R ( R R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR H s c C s& t t | ƒ i ƒ } | i | d <| S( NR ( R& R% R R ( R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR L s
c C s
- | i ƒ S( N( R ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR Q s c C sC t | d d ƒ } | d j o | i ƒ Sn t | i d | i ƒ S( NR ( ( R R R R R R ( R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyt contentV s
+ | i ƒ S( N( R ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR Q s c C sC t | d d ƒ } | d j o | i ƒ Sn t | i d | i ƒ S( NR ( ( R R R R R R ( R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyt contentV s
c C sh t | i d | i ƒ | i i i ƒ d j o d Sn t i i | i | i f t ƒ | _
| i
| ƒ S( Ni. i/ ( ( i. i/ ( R R R R t getStatusR R
- t getMultiAdapterR R R ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR ] s N( R R R R R R! R R R R R R R# R$ R" R' R ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR% @ s
+ t getMultiAdapterR R R ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR ] s N( R R R R R R! R R R R R R R# R$ R" R' R ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR% @ s
t Formc B sB e Z d Z e i ƒ d „ Z d „ Z e d „ ƒ Z d „ Z RS( s A form class.
- c C s& t t | ƒ i | | ƒ d | _ d S( N( R& R* R R R ( R R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR m s c C s& t t | ƒ i ƒ } | i | d <| S( NR ( R& R* R R ( R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR q s
-c C sC t | d d ƒ } | d j o | i ƒ Sn t | i d | i ƒ S( NR ( ( R R R R R R ( R R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR' v s
+ c C s& t t | ƒ i | | ƒ d | _ d S( N( R& R* R R R ( R R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR m s c C s& t t | ƒ i ƒ } | i | d <| S( NR ( R& R* R R ( R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR q s
+c C sC t | d d ƒ } | d j o | i ƒ Sn t | i d | i ƒ S( NR ( ( R R R R R R ( R R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR' v s
c C s“ t | i d | i ƒ | i i i ƒ d j o d Sn | i ƒ | i i i ƒ d j o d Sn t i i | i | i f t
ƒ | _ | i | ƒ S( sI Calls update and returns the layout template which calls render.
i. i/ N( ( i. i/ ( i. i/ ( R R R R R( t update_formR R
- R) R R R ( R ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR } s
+ R) R R R ( R ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR } s
(
- R R R R R R R R" R' R ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pyR* h s
+ R R R R R R R R" R' R ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pyR* h s
( t zope.componentR t
grokcore.viewt grokcoret grokcore.formlibt grokcore.componentR
R t zope.interfaceR t zope.publisher.publishR t
megrok.layoutR R t objectR R
- t ViewR% t formlibR* ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/components.pys <module> s 4 (
\ No newline at end of file
+ t ViewR% t formlibR* ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/components.pys <module> s 4 (
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftesting.zcml
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftesting.zcml 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftesting.zcml 2010-10-18 09:57:29 UTC (rev 117642)
@@ -4,12 +4,12 @@
<include package="zope.app.zcmlfiles" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
- <include package="megrok.layout" file="meta.zcml" />
+ <include package="megrok.layout" />
<include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
- <include package="grokcore.view" />
+ <include package="grokcore.view" file="meta.zcml" />
<grok:grok package="megrok.layout.ftests" />
<securityPolicy
Modified: megrok.layout/trunk/src/megrok/layout/ftests/__init__.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/__init__.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/__init__.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,7 +1,7 @@
³ò
-‹ÉDJc @ sk d d k Z d d k Z d d k l Z e i i e i i e i i
+—)®Jc @ sk d d k Z d d k Z d d k l Z e i i e i i e i i
ƒ d ƒ Z e e e d d e
ƒZ d S( iÿÿÿÿN( t ZCMLLayers
ftesting.zcmlt FunctionalLayert allow_teardown( t os.patht ost
megrok.layoutt megrokt zope.app.testing.functionalR t patht joint dirnamet layoutt __file__t
- ftesting_zcmlt __name__t TrueR ( ( ( sE /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/__init__.pys <module> s
\ No newline at end of file
+ ftesting_zcmlt __name__t TrueR ( ( ( sN /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/__init__.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_general.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_general.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_general.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,14 +1,14 @@
³ò
-‹ÉDJc @ s• d d k Z d d k Z d d k l Z d d k l Z d d k Z d d k l Z d d k l Z d „ Z
+—)®Jc @ s• d d k Z d d k Z d d k l Z d d k l Z d d k Z d d k l Z d d k l Z d „ Z
d „ Z d „ Z d „ Z
d
- „ Z d S( iÿÿÿÿN( t cleanup( t module( t component( t layoutc C s t i | d ƒ d S( Nt __main__( R t setUp( t test( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pyt moduleSetUp
- s c C s t i | ƒ t i ƒ d S( N( R t tearDownR t cleanUp( R ( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pyt moduleTearDown
+ „ Z d S( iÿÿÿÿN( t cleanup( t module( t component( t layoutc C s t i | d ƒ d S( Nt __main__( R t setUp( t test( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pyt moduleSetUp
+ s c C s t i | ƒ t i ƒ d S( N( R t tearDownR t cleanUp( R ( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pyt moduleTearDown
s
-c C s t i i i | ƒ d S( N( t zopeR t eventtestingR ( R ( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pyt zopeSetUp s c C s t i ƒ d S( N( R R ( R ( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pyt zopeTearDown s c C sT t i t i B} h } t i ƒ } | i t i d d | d t d t d | ƒƒ | S( Ns
+c C s t i i i | ƒ d S( N( t zopeR t eventtestingR ( R ( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pyt zopeSetUp s c C s t i ƒ d S( N( R R ( R ( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pyt zopeTearDown s c C sT t i t i B} h } t i ƒ } | i t i d d | d t d t d | ƒƒ | S( Ns
../README.txtt optionflagsR R t globs( t doctestt NORMALIZE_WHITESPACEt ELLIPSISt unittestt TestSuitet addTestt DocFileSuiteR R
- ( R R t suite( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pyt
+ ( R R t suite( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pyt
test_suite s
( R R t zope.testingR R t zope.component.eventtestingR R t megrokR R R
R
- R R ( ( ( sI /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_general.pys <module> s
\ No newline at end of file
+ R R ( ( ( sR /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_general.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_layout.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_layout.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_layout.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-í+OJc @ s d Z d d k i Z d d k l Z d d k l Z d e i f d „ ƒ YZ d e i f d „ ƒ YZ
+—)®Jc @ s d Z d d k i Z d d k l Z d d k l Z d e i f d „ ƒ YZ d e i f d „ ƒ YZ
d e f d
„ ƒ YZ d e f d „ ƒ YZ d
„ Z
@@ -24,10 +24,10 @@
>>> mycontextlayout.render()
'<div> MyContextLayout </div>'
iÿÿÿÿN( t interface( t Layoutt Mammothc B s e Z RS( ( t __name__t
- __module__( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyR s t Elephantc B s e Z RS( ( R R ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyR ! s t MyLayoutc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Ns <div> MyLayout </div>( ( t self( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyt render( s ( R R t grokt contextR t InterfaceR ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyR % s t MyContextLayoutc B s e Z e i e ƒ d „ Z RS( c C s d S( Ns <div> MyContextLayout </div>( ( R ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyR / s ( R
R R R
- R R ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyR , s
+ __module__( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyR s t Elephantc B s e Z RS( ( R R ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyR ! s t MyLayoutc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Ns <div> MyLayout </div>( ( t self( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyt render( s ( R R t grokt contextR t InterfaceR ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyR % s t MyContextLayoutc B s e Z e i e ƒ d „ Z RS( c C s d S( Ns <div> MyContextLayout </div>( ( R ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/
ftests/test_layout.pyR / s ( R R R R
+ R R ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyR , s
c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR
t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R
- R t suite( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pyt
+ R t suite( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pyt
test_suite3 s ( t __doc__t grokcore.componentt componentR t zopeR t
- megrok.layoutR t ContextR R R R R ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layout.pys <module> s
\ No newline at end of file
+ megrok.layoutR t ContextR R R R R ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layout.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.py 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.py 2010-10-18 09:57:29 UTC (rev 117642)
@@ -7,7 +7,7 @@
>>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> browser.handleErrors = False
- >>> browser.open("http://localhost/++skin++Basic/a/@@myview")
+ >>> browser.open("http://localhost/++skin++mydefaultskin/a/@@myview")
>>> print browser.contents
<div> A Layout </div>
@@ -25,12 +25,22 @@
from zope import interface
from megrok.layout import Layout, Page
-from zope.app.basicskin import IBasicSkin
-layer(IBasicSkin)
+from grokcore.view import IDefaultBrowserLayer
+class IMyDefaultLayer(IDefaultBrowserLayer):
+ pass
-class MySkinLayer(IBasicSkin):
+
+class MyDefaultSkin(IMyDefaultLayer):
+ skin('mydefaultskin')
+
+
+layer(IMyDefaultLayer)
+
+
+
+class MySkinLayer(IDefaultBrowserLayer):
pass
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_layoutlayers.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,16 +1,15 @@
³ò
-§|iJc @ sD d Z d d k i Z d d k l Z l Z d d k l Z d d k l
+}/®Jc @ sp d Z d d k i Z d d k l Z l Z d d k l Z d d k l
Z
- l Z d d k l
- Z
- e e
- ƒ d e
- f d „ ƒ YZ d e f d
- „ ƒ YZ d e i f d „ ƒ YZ d
- e i f d „ ƒ YZ d e
- f d „ ƒ YZ d e
- f d „ ƒ YZ d e
- f d „ ƒ YZ d e f d „ ƒ YZ d e f d „ ƒ YZ d „ Z d S( s˜
+ l Z d d k l Z d e f d „ ƒ YZ
+ d e
+ f d
+ „ ƒ YZ e e
+ ƒ d e f d „ ƒ YZ d
+ e f d „ ƒ YZ d e i f d „ ƒ YZ d e i f d „ ƒ YZ d e
+ f d „ ƒ YZ d e
+ f d „ ƒ YZ d e
+ f d „ ƒ YZ d e f d „ ƒ YZ d e f d „ ƒ YZ d „ Z d S( s
>>> from zope.app.testing.functional import getRootFolder
>>> getRootFolder()["a"] = A()
>>> getRootFolder()["b"] = B()
@@ -19,7 +18,7 @@
>>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> browser.handleErrors = False
- >>> browser.open("http://localhost/++skin++Basic/a/@@myview")
+ >>> browser.open("http://localhost/++skin++mydefaultskin/a/@@myview")
>>> print browser.contents
<div> A Layout </div>
@@ -30,18 +29,17 @@
>>> browser.open("http://localhost/++skin++myskin/b/@@myviewb")
>>> print browser.contents
<div> B Layout </div>
-iÿÿÿÿN( t layert skin( t interface( t Layoutt Page( t
- IBasicSkint MySkinLayerc B s e Z RS( ( t __name__t
- __module__( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR ! s t MySkinc B s e Z e d ƒ RS( t myskin( R R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR % s t Ac B s e Z RS( ( R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR ) s t Bc B s e Z RS( ( R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR - s t ALayoutc B s e Z e i e ƒ d „ Z RS( c C s d S( Ns <div> A Layout </div>( ( t self( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyt render4 s ( R R t grokt contextR R ( ( (
sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR
- 1 s
-t A2Layoutc B s( e Z e i e ƒ e e ƒ d „ Z RS( c C s d S( Ns <div> A2 Layout </div>( ( R ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR < s ( R R R R R R R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR 8 s
+iÿÿÿÿN( t layert skin( t interface( t Layoutt Page( t IDefaultBrowserLayert IMyDefaultLayerc B s e Z RS( ( t __name__t
+ __module__( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR s t
+ MyDefaultSkinc B s e Z e d ƒ RS( t
+ mydefaultskin( R R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR # s t MySkinLayerc B s e Z RS( ( R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR + s t MySkinc B s e Z e d ƒ RS( t myskin( R R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR / s t Ac B s e Z RS( ( R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR 3 s t Bc B s e Z RS( ( R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR 7 s t ALayoutc B s e Z e i e ƒ d „ Z RS( c
C s d S( Ns <div> A Layout </div>( ( t self( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyt render> s ( R R t grokt contextR R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR ; s
+t A2Layoutc B s( e Z e i e ƒ e e ƒ d „ Z RS( c C s d S( Ns <div> A2 Layout </div>( ( R ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR F s ( R R R R R R R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR B s
-t BLayoutc B s( e Z e i e ƒ e e ƒ d „ Z RS( c C s d S( Ns <div> B Layout </div>( ( R ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR D s ( R R R R R R R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR @ s
+t BLayoutc B s( e Z e i e ƒ e e ƒ d „ Z RS( c C s d S( Ns <div> B Layout </div>( ( R ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR N s ( R R R R R R R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR J s
-t MyViewc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Nt MYVIEW( ( R ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR K s ( R R R R R t InterfaceR ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR H s t MyViewBc B s+ e Z e i e i ƒ e e ƒ d „ Z RS( c C s d S( NR ( ( R ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR S s ( R R R R R R R R R ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyR O s
-c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISR ( R R t suite( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pyt
- test_suiteW s ( t __doc__t grokcore.componentt componentR t
+t MyViewc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Nt MYVIEW( ( R ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR U s ( R R R R R t InterfaceR ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR R s t MyViewBc B s+ e Z e i e i ƒ e e ƒ d „ Z RS( c C s d S( NR ( ( R ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR ] s ( R R R R R R R R R ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyR Y s
+c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISR ( R R t suite( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pyt
+ test_suitea s ( t __doc__t grokcore.componentt componentR t
grokcore.viewR R t zopeR t
- megrok.layoutR R t zope.app.basicskinR R R t ContextR R R
- R R R R R! ( ( ( sN /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_layoutlayers.pys <module> s
-
\ No newline at end of file
+ megrok.layoutR R R R R R R t ContextR R R R R R R R$ ( ( ( sW /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_layoutlayers.pys <module> s$
+
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_page.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_page.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_page.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-n)OJc @ s§ d Z d d k i Z d d k l Z d d k l Z d d k l Z l
+—)®Jc @ s§ d Z d d k i Z d d k l Z d d k l Z d d k l Z l
Z
e d ƒ d e i f d „ ƒ YZ d e f d
„ ƒ YZ
@@ -31,13 +31,13 @@
<p> My nice Content </p>
iÿÿÿÿN( t templatedir( t interface( t Layoutt Paget templatest Cowc B s e Z RS( ( t __name__t
- __module__( ( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pyR $ s t Masterc B s" e Z e i d ƒ e i e ƒ RS( t master( R R t grokt namet contextR ( ( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pyR ( s
-t MyViewc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Ns <p> My nice Content </p>( ( t self( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pyt render0 s ( R R R
- R R t InterfaceR ( ( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pyR
- - s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pyt
+ __module__( ( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pyR $ s t Masterc B s" e Z e i d ƒ e i e ƒ RS( t master( R R t grokt namet contextR ( ( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pyR ( s
+t MyViewc B s! e Z e i e i ƒ d „ Z RS( c C s d S( Ns <p> My nice Content </p>( ( t self( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pyt render0 s ( R R R
+ R R t InterfaceR ( ( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pyR
+ - s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pyt
test_suite4 s ( t __doc__t grokcore.componentt componentR
t
grokcore.viewR t zopeR t
megrok.layoutR R t ContextR R R
- R ( ( ( sF /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_page.pys <module> s
+ R ( ( ( sO /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_page.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_static.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_static.py 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_static.py 2010-10-18 09:57:29 UTC (rev 117642)
@@ -20,8 +20,9 @@
class LayoutWithResources(Layout):
- pass
+ def render(self):
+ return ""
def test_suite():
from zope.testing import doctest
Modified: megrok.layout/trunk/src/megrok/layout/ftests/test_static.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/ftests/test_static.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/ftests/test_static.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-n)OJc @ sa d Z d d k i Z d d k l Z d e i f d „ ƒ YZ d e f d „ ƒ YZ d „ Z d S( s»
+}5®Jc @ sa d Z d d k i Z d d k l Z d e i f d „ ƒ YZ d e f d „ ƒ YZ d „ Z d S( s»
>>> from megrok.layout import ILayout
>>> from zope.component import getMultiAdapter
>>> from zope.publisher.browser import TestRequest
@@ -11,8 +11,8 @@
>>> mylayout.static['empty.js']
<zope.app.publisher.browser.fileresource.FileResource object at ...>
iÿÿÿÿN( t Layoutt Dummyc B s e Z RS( ( t __name__t
- __module__( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_static.pyR s t LayoutWithResourcesc B s e Z RS( ( R R ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_static.pyR s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_static.pyt
- test_suite s (
+ __module__( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_static.pyR s t LayoutWithResourcesc B s e Z d „ Z RS( c C s d S( Nt ( ( t self( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_static.pyt render s ( R R R ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_static.pyR s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_static.pyt
+ test_suite s (
t __doc__t grokcore.componentt componentt grokt
- megrok.layoutR t ContextR R R ( ( ( sH /Users/cklinger/megrok/megrok.layout/megrok/layout/ftests/test_static.pys <module> s
-
\ No newline at end of file
+ megrok.layoutR t ContextR R R ( ( ( sQ /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/ftests/test_static.pys <module> s
+
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/interfaces.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/interfaces.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/interfaces.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,6 +1,6 @@
³ò
-‹ÉDJc @ s@ d d k l Z d e f d „ ƒ YZ d e f d „ ƒ YZ d S( iÿÿÿÿ( t Interfacet ILayoutc B s e Z d Z RS( s Layout code.
+—)®Jc @ s@ d d k l Z d e f d „ ƒ YZ d e f d „ ƒ YZ d S( iÿÿÿÿ( t Interfacet ILayoutc B s e Z d Z RS( s Layout code.
( t __name__t
- __module__t __doc__( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/interfaces.pyR s t IPagec B s e Z d Z RS( s0 A template using a layout to render itself.
- ( R R R ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/interfaces.pyR
- s N( t zope.interfaceR R R ( ( ( s@ /Users/cklinger/megrok/megrok.layout/megrok/layout/interfaces.pys <module> s
\ No newline at end of file
+ __module__t __doc__( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/interfaces.pyR s t IPagec B s e Z d Z RS( s0 A template using a layout to render itself.
+ ( R R R ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/interfaces.pyR
+ s N( t zope.interfaceR R R ( ( ( sI /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/interfaces.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/meta.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/meta.py 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/meta.py 2010-10-18 09:57:29 UTC (rev 117642)
@@ -43,6 +43,8 @@
return render and not base_method
def has_no_render(factory):
- return not getattr(factory, 'render', None)
+ render = getattr(factory, 'render', None)
+ base_method = getattr(render, 'base_method', False)
+ return render is None or base_method
templates.checkTemplates(module_info, factory, 'view',
has_render, has_no_render)
Modified: megrok.layout/trunk/src/megrok/layout/meta.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/meta.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/meta.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,21 +1,21 @@
³ò
-‹ÉDJc @ sg d d k Z d d k Z d d k Z d d k l Z l Z d d k l Z d e i
+ä4®Jc @ sg d d k Z d d k Z d d k Z d d k l Z l Z d d k l Z d e i
f d „ ƒ YZ d S( iÿÿÿÿN( t ILayoutt Layout( t IDefaultBrowserLayert
LayoutGrokkerc B s\ e Z e i e ƒ e i e i i ƒ e i e i i d e
ƒd „ Z d „ Z d „ Z
- RS( t defaultc K s( | | _ t t | ƒ i | | | | S( N( t module_infot superR t grok( t selft namet factoryR t kw( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyR s c K s• | i i d d ƒ } | d j o/ | i d d d | i d | | i | f ƒ n | | f } | i d d | t f d t i i d | | t f ƒ t S( Ns grok.templatest
+ RS( t defaultc K s( | | _ t t | ƒ i | | | | S( N( t module_infot superR t grok( t selft namet factoryR t kw( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyR s c K s• | i i d d ƒ } | d j o/ | i d d d | i d | | i | f ƒ n | | f } | i d d | t f d t i i d | | t f ƒ t S( Ns grok.templatest
discriminatort callablet argst adapter(
R t
getAnnotationt Nonet actiont checkTemplatesR t zopet componentt provideAdaptert True( R R
- t configt contextt layerR t templatest adapts( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyt execute s
+ t configt contextt layerR t templatest adapts( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyt execute s
c C s/ d „ } d „ } | i | | d | | ƒ d S( Nc S s0 t | d d ƒ } t | d t ƒ } | o | S( Nt rendert base_method( t getattrR t False( R
- R R ( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyt
- has_render( s c S s t | d d ƒ S( NR ( R R ( R
- ( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyt
- has_no_render- s t view( R ( R R R R
- R" R# ( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyR & s ( t __name__t
- __module__t martianR R t directivet grokcoreR R$ R R R R R ( ( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pyR
+ R R ( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyt
+ has_render( s c S s5 t | d d ƒ } t | d t ƒ } | d j p | S( NR R ( R R R! ( R
+ R R ( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyt
+ has_no_render- s t view( R ( R R R R
+ R" R# ( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyR & s ( t __name__t
+ __module__t martianR R t directivet grokcoreR R$ R R R R R ( ( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pyR
s
( R' t zope.componentR t grokcore.componentR) t
- megrok.layoutR R t! zope.publisher.interfaces.browserR t ClassGrokkerR ( ( ( s: /Users/cklinger/megrok/megrok.layout/megrok/layout/meta.pys <module> s
+ megrok.layoutR R t! zope.publisher.interfaces.browserR t ClassGrokkerR ( ( ( sC /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/meta.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/meta.zcml
===================================================================
--- megrok.layout/trunk/src/megrok/layout/meta.zcml 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/meta.zcml 2010-10-18 09:57:29 UTC (rev 117642)
@@ -4,8 +4,8 @@
<include package="grokcore.component" file="meta.zcml" />
<include package="grokcore.security" file="meta.zcml" />
- <include package="grokcore.view" file="meta.zcml" />
- <include package="grokcore.view.templatereg" file="meta.zcml" />
+
+ <include package="grokcore.view" file="meta-minimal.zcml" />
<grok:grok package=".meta" />
</configure>
Modified: megrok.layout/trunk/src/megrok/layout/testing.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/testing.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/testing.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,2 +1,2 @@
³ò
-n)OJc @ s- d d k l Z d d k l Z d „ Z d S( iÿÿÿÿ( t ConfigurationMachine( t zcmlc C sg t ƒ } t i d | ƒ t i d | ƒ t i d | ƒ t i d | ƒ t i | | ƒ | i ƒ d S( Ns grokcore.component.metas grokcore.security.metas grokcore.view.metas grokcore.view.templatereg( R R t do_grokt execute_actions( t module_namet config( ( s= /Users/cklinger/megrok/megrok.layout/megrok/layout/testing.pyt grok s N( t zope.configuration.configR t grokcore.componentR R ( ( ( s= /Users/cklinger/megrok/megrok.layout/megrok/layout/testing.pys <module> s
\ No newline at end of file
+—)®Jc @ s- d d k l Z d d k l Z d „ Z d S( iÿÿÿÿ( t ConfigurationMachine( t zcmlc C sg t ƒ } t i d | ƒ t i d | ƒ t i d | ƒ t i d | ƒ t i | | ƒ | i ƒ d S( Ns grokcore.component.metas grokcore.security.metas grokcore.view.metas grokcore.view.templatereg( R R t do_grokt execute_actions( t module_namet config( ( sF /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/testing.pyt grok s N( t zope.configuration.configR t grokcore.componentR R ( ( ( sF /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/testing.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/tests/__init__.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/__init__.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/tests/__init__.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,2 +1,2 @@
³ò
-‹ÉDJc @ s d S( N( ( ( ( sD /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/__init__.pys <module> s
\ No newline at end of file
+—)®Jc @ s d S( N( ( ( ( sM /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/tests/__init__.pys <module> s
\ No newline at end of file
Deleted: megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.py
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.py 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.py 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,31 +0,0 @@
-"""
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- ConfigurationExecutionError: <class 'martian.error.GrokError'>: View <class 'megrok.layout.tests.test_renderortemplate.View'> has no associated template or 'render' method.
- in:
- <BLANKLINE>
-"""
-
-import grokcore.component as grok
-from grokcore.view import View
-from megrok.layout import Layout
-from zope.interface import Interface
-
-
-class MyLayout(Layout):
- grok.context(Interface)
-
-
-class View(View):
- grok.context(Interface)
-
-
-def test_suite():
- from zope.testing import doctest
- from megrok.layout.ftests import FunctionalLayer
- suite = doctest.DocTestSuite(
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS
- )
- suite.layer = FunctionalLayer
- return suite
Deleted: megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/tests/test_renderortemplate.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,15 +0,0 @@
-³ò
-í+OJc @ s~ d Z d d k i Z d d k l Z d d k l Z d d k l Z d e f d „ ƒ YZ
- d e f d „ ƒ YZ d
- „ Z d S( s
- >>> grok.testing.grok(__name__)
- Traceback (most recent call last):
- ...
- ConfigurationExecutionError: <class 'martian.error.GrokError'>: View <class 'megrok.layout.tests.test_renderortemplate.View'> has no associated template or 'render' method.
- in:
- <BLANKLINE>
-iÿÿÿÿN( t View( t Layout( t Interfacet MyLayoutc B s e Z e i e ƒ RS( ( t __name__t
- __module__t grokt contextR ( ( ( sQ /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_renderortemplate.pyR s R c B s e Z e i e ƒ RS( ( R R R R R ( ( ( sQ /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_renderortemplate.pyR s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sQ /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_renderortemplate.pyt
- test_suite s ( t __doc__t grokcore.componentt componentR t
- grokcore.viewR t
- megrok.layoutR t zope.interfaceR R R ( ( ( sQ /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_renderortemplate.pys <module> s
\ No newline at end of file
Modified: megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.pyc
===================================================================
--- megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.pyc 2010-10-18 09:57:23 UTC (rev 117641)
+++ megrok.layout/trunk/src/megrok/layout/tests/test_samecontext.pyc 2010-10-18 09:57:29 UTC (rev 117642)
@@ -1,5 +1,5 @@
³ò
-í+OJc @ sn d Z d d k i Z d d k l Z d d k l Z d e f d „ ƒ YZ d e f d „ ƒ YZ d „ Z
+—)®Jc @ sn d Z d d k i Z d d k l Z d d k l Z d e f d „ ƒ YZ d e f d „ ƒ YZ d „ Z
d S(
sQ
>>> grok.testing.grok(__name__)
@@ -8,7 +8,7 @@
ConfigurationConflictError: Conflicting configuration actions
For: ('adapter', (<InterfaceClass zope.interface.Interface>, <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>), <InterfaceClass megrok.layout.interfaces.ILayout>)
iÿÿÿÿN( t Layout( t Interfacet MyLayoutc B s e Z e i e ƒ RS( ( t __name__t
- __module__t grokt contextR ( ( ( sL /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_samecontext.pyR s t
- MyOtherLayoutc B s e Z e i e ƒ RS( ( R R R R R ( ( ( sL /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_samecontext.pyR s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sL /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_samecontext.pyt
+ __module__t grokt contextR ( ( ( sU /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/tests/test_samecontext.pyR s t
+ MyOtherLayoutc B s e Z e i e ƒ RS( ( R R R R R ( ( ( sU /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/tests/test_samecontext.pyR s c C sI d d k l } d d k l } | i d | i | i Bƒ } | | _ | S( Niÿÿÿÿ( t doctest( t FunctionalLayert optionflags( t zope.testingR t megrok.layout.ftestsR t DocTestSuitet NORMALIZE_WHITESPACEt ELLIPSISt layer( R R t suite( ( sU /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/tests/test_samecontext.pyt
test_suite s ( t __doc__t grokcore.componentt componentR t
- megrok.layoutR t zope.interfaceR R R R ( ( ( sL /Users/cklinger/megrok/megrok.layout/megrok/layout/tests/test_samecontext.pys <module> s
\ No newline at end of file
+ megrok.layoutR t zope.interfaceR R R R ( ( ( sU /Users/cklinger/work/dolmen/megrok.layout/src/megrok/layout/tests/test_samecontext.pys <module> s
\ No newline at end of file
More information about the checkins
mailing list