[Checkins] SVN: Sandbox/darrylcousins/ Oops, bad import
Darryl Cousins
darryl at darrylcousins.net.nz
Sun Jul 22 19:32:46 EDT 2007
Log message for revision 78281:
Oops, bad import
Changed:
D Sandbox/darrylcousins/buildout.cfg
D Sandbox/darrylcousins/deploy.ini
D Sandbox/darrylcousins/log/
U Sandbox/darrylcousins/mars.formdemo/src/mars/formdemo/application.zcml
U Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py
U Sandbox/darrylcousins/mars.template/src/mars/template/template.txt
U Sandbox/darrylcousins/mars.view/src/mars/view/components.py
D Sandbox/darrylcousins/setup.py
D Sandbox/darrylcousins/site.zcml
D Sandbox/darrylcousins/src/
A Sandbox/darrylcousins/tools.py
D Sandbox/darrylcousins/var/
D Sandbox/darrylcousins/zope.conf
-=-
Deleted: Sandbox/darrylcousins/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/buildout.cfg 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/buildout.cfg 2007-07-22 23:32:46 UTC (rev 78281)
@@ -1,22 +0,0 @@
-[buildout]
-develop = . z3c.authentication z3c.resource
-parts = app test
-find-links = http://download.zope.org/distribution/
-eggs-directory = /opt/buildout/eggs
-newest = false
-
-[app]
-recipe = zc.recipe.egg
-eggs = tfws.website
- Paste
- PasteScript
- PasteDeploy
- z3c.authentication
- z3c.resource
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = tfws.website
- z3c.authentication
- z3c.resource
-defaults = ['--tests-pattern', '^f?tests$', '-v']
Deleted: Sandbox/darrylcousins/deploy.ini
===================================================================
--- Sandbox/darrylcousins/deploy.ini 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/deploy.ini 2007-07-22 23:32:46 UTC (rev 78281)
@@ -1,7 +0,0 @@
-[app:main]
-use = egg:tfws.website
-
-[server:main]
-use = egg:Paste#http
-host = 127.0.0.1
-port = 8080
Modified: Sandbox/darrylcousins/mars.formdemo/src/mars/formdemo/application.zcml
===================================================================
--- Sandbox/darrylcousins/mars.formdemo/src/mars/formdemo/application.zcml 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/mars.formdemo/src/mars/formdemo/application.zcml 2007-07-22 23:32:46 UTC (rev 78281)
@@ -13,6 +13,7 @@
<include package="zope.app.securitypolicy" file="meta.zcml" />
<include package="zope.rdb" file="meta.zcml" />
<include package="zope.viewlet" file="meta.zcml" />
+
<include package="z3c.form" file="meta.zcml" />
<include package="z3c.macro" file="meta.zcml" />
<include package="z3c.pagelet" file="meta.zcml" />
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/tests.py 2007-07-22 23:32:46 UTC (rev 78281)
@@ -15,7 +15,5 @@
return suite
-
-
if __name__ == '__main__':
unittest.main(defaultTest='test_suite')
Modified: Sandbox/darrylcousins/mars.template/src/mars/template/template.txt
===================================================================
--- Sandbox/darrylcousins/mars.template/src/mars/template/template.txt 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/mars.template/src/mars/template/template.txt 2007-07-22 23:32:46 UTC (rev 78281)
@@ -24,6 +24,11 @@
>>> import os, tempfile
>>> temp_dir = tempfile.mkdtemp()
+We need a request object to use in the tests.
+
+ >>> from zope.publisher.browser import TestRequest
+ >>> request = TestRequest()
+
Let's create a content object that will act as the context to the views.
>>> class Content(object):
@@ -99,9 +104,6 @@
We can now look up the view and expect the template to be rendered.
- >>> from zope.publisher.browser import TestRequest
- >>> request = TestRequest()
-
>>> view = zope.component.getMultiAdapter((content, request),
... name='view.html')
>>> print view.render()
Modified: Sandbox/darrylcousins/mars.view/src/mars/view/components.py
===================================================================
--- Sandbox/darrylcousins/mars.view/src/mars/view/components.py 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/mars.view/src/mars/view/components.py 2007-07-22 23:32:46 UTC (rev 78281)
@@ -63,5 +63,6 @@
class PageletView(TemplateViewBase, LayoutViewBase, BrowserPage):
zope.interface.implements(IPagelet)
- def __init__(self, context, request):
- BrowserPage.__init__(self, context, request)
+ __init__ = BrowserPage.__init__
+
+class SimpleView
Deleted: Sandbox/darrylcousins/setup.py
===================================================================
--- Sandbox/darrylcousins/setup.py 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/setup.py 2007-07-22 23:32:46 UTC (rev 78281)
@@ -1,56 +0,0 @@
-from setuptools import setup, find_packages
-
-version = '0.0'
-
-setup(name='tfws.website',
- version=version,
- description="",
- long_description="""\
-""",
- # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
- classifiers=[],
- keywords="",
- author="",
- author_email="",
- url="",
- license="",
- package_dir={'': 'src'},
- packages=find_packages('src'),
- include_package_data=True,
- zip_safe=False,
- install_requires=['setuptools',
- 'lxml',
- 'grok',
- 'zope.app.file',
- 'z3c.etestbrowser',
- 'z3c.breadcrumb',
- 'z3c.configurator',
- 'z3c.form',
- 'z3c.form',
- 'z3c.formui',
- 'z3c.layer',
- 'z3c.pagelet',
- 'z3c.schema',
- 'z3c.template',
- 'z3c.testing',
- 'z3c.viewlet',
- 'z3c.zrtresource',
- 'z3c.formdemo',
- 'zc.resourcelibrary',
- 'zc.table',
- 'mars.adapter',
- 'mars.contentprovider',
- 'mars.form',
- 'mars.layer',
- 'mars.macro',
- 'mars.resource',
- 'mars.template',
- 'mars.view',
- 'mars.viewlet',
- # Add extra requirements here
- ],
- entry_points="""
- [paste.app_factory]
- main = tfws.website.application:application_factory
- """,
- )
Deleted: Sandbox/darrylcousins/site.zcml
===================================================================
--- Sandbox/darrylcousins/site.zcml 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/site.zcml 2007-07-22 23:32:46 UTC (rev 78281)
@@ -1,36 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope"
- i18n_domain="tfws.website">
-
- <include package="tfws.website" />
-
- <securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <unauthenticatedPrincipal id="zope.anybody"
- title="Unauthenticated User" />
- <unauthenticatedGroup id="zope.Anybody"
- title="Unauthenticated Users" />
- <authenticatedGroup id="zope.Authenticated"
- title="Authenticated Users" />
- <everybodyGroup id="zope.Everybody"
- title="All Users" />
- <principal id="zope.manager"
- title="Manager"
- login="tfws"
- password_manager="Plain Text"
- password="tfws"
- />
-
- <!-- Replace the following directive if you don't want public access -->
- <grant permission="zope.View"
- principal="zope.Anybody" />
- <grant permission="zope.app.dublincore.view"
- principal="zope.Anybody" />
-
- <role id="zope.Manager" title="Site Manager" />
- <role id="zope.Member" title="Site Member" />
- <grantAll role="zope.Manager" />
- <grant role="zope.Manager"
- principal="zope.manager" />
-
-</configure>
Added: Sandbox/darrylcousins/tools.py
===================================================================
--- Sandbox/darrylcousins/tools.py (rev 0)
+++ Sandbox/darrylcousins/tools.py 2007-07-22 23:32:46 UTC (rev 78281)
@@ -0,0 +1,59 @@
+#!bin/env python
+
+import os
+import cStringIO
+import sys
+
+usage = """
+Usage: tools.py [action] [option]
+
+Actions
+-------
+
+--dist will create and upload eggs
+--test will cd into each folder and run bin/test
+--help will show this message
+
+Options
+-------
+
+--all will run action on all directories
+
+Default action is --tests
+Default option is --all
+
+"""
+
+action = '--test'
+option = '--all'
+
+actions = ['--dist', '--test', '--help']
+options = ['--all']
+
+args = sys.argv
+for arg in sys.argv:
+ if arg in actions:
+ action = arg
+ if arg in options:
+ option = arg
+
+if action == '--help':
+ print usage
+ sys.exit()
+
+def main(action, option):
+ dirs = [d for d in os.listdir('.') if os.path.isdir(d)]
+ packages = []
+ for package in dirs:
+ path = os.path.join(os.getcwd(), package)
+ if not path.endswith('.svn') and not path.endswith('.'):
+ packages.append(path)
+ for package in packages:
+ os.chdir(package)
+ if action == '--test':
+ print "Running tests in directory %s" % package
+ os.system('./bin/test -vv')
+
+
+main(action, option)
+
Property changes on: Sandbox/darrylcousins/tools.py
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: Sandbox/darrylcousins/zope.conf
===================================================================
--- Sandbox/darrylcousins/zope.conf 2007-07-22 23:29:32 UTC (rev 78280)
+++ Sandbox/darrylcousins/zope.conf 2007-07-22 23:32:46 UTC (rev 78281)
@@ -1,38 +0,0 @@
-# Identify the component configuration used to define the site:
-site-definition site.zcml
-
-<zodb>
- # Standard Filestorage
- <filestorage>
- path var/Data.fs
- </filestorage>
-
-# Uncomment this if you want to connect to a ZEO server instead:
-# <zeoclient>
-# server localhost:8100
-# storage 1
-# # ZEO client cache, in bytes
-# cache-size 20MB
-# # Uncomment to have a persistent disk cache
-# #client zeo1
-# </zeoclient>
-</zodb>
-
-<eventlog>
- # This sets up logging to both a file and to standard output
- # (STDOUT). The "path" setting can be a relative or absolute
- # filesystem path or the tokens STDOUT or STDERR.
-
- <logfile>
- path log/z3.log
- formatter zope.exceptions.log.Formatter
- </logfile>
-
- <logfile>
- path STDOUT
- formatter zope.exceptions.log.Formatter
- </logfile>
-</eventlog>
-
-# Uncomment this to switch on developer mode (e.g. for APIDoc)
-devmode on
More information about the Checkins
mailing list