[Checkins] SVN: z3c.widget/trunk/ buildout and egg, clean imports
Bernd Dorn
bernd.dorn at lovelysystems.com
Tue Apr 10 08:56:30 EDT 2007
Log message for revision 74087:
buildout and egg, clean imports
Changed:
_U z3c.widget/trunk/
A z3c.widget/trunk/bootstrap.py
A z3c.widget/trunk/buildout.cfg
A z3c.widget/trunk/setup.cfg
A z3c.widget/trunk/setup.py
U z3c.widget/trunk/src/z3c/__init__.py
U z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py
U z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml
U z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py
U z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/widget.py
U z3c.widget/trunk/src/z3c/widget/flashupload/ticket.py
U z3c.widget/trunk/src/z3c/widget/flashupload/upload.py
U z3c.widget/trunk/src/z3c/widget/image/widget.py
U z3c.widget/trunk/src/z3c/widget/namespace/namespace.py
U z3c.widget/trunk/src/z3c/widget/namespace/tests.py
U z3c.widget/trunk/src/z3c/widget/sequence/tests.py
U z3c.widget/trunk/src/z3c/widget/sequence/widget.py
U z3c.widget/trunk/src/z3c/widget/tiny/tests.py
U z3c.widget/trunk/src/z3c/widget/tiny/widget.py
-=-
Property changes on: z3c.widget/trunk
___________________________________________________________________
Name: svn:ignore
+ bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
Added: z3c.widget/trunk/bootstrap.py
===================================================================
--- z3c.widget/trunk/bootstrap.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/bootstrap.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -0,0 +1,52 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+
+tmpeggs = tempfile.mkdtemp()
+
+ez = {}
+exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ ).read() in ez
+ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+import pkg_resources
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+if sys.platform == 'win32':
+ cmd = '"%s"' % cmd # work around spawn lamosity on windows
+
+ws = pkg_resources.working_set
+assert os.spawnle(
+ os.P_WAIT, sys.executable, sys.executable,
+ '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
+ dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse('setuptools')).location
+ ),
+ ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout')
+import zc.buildout.buildout
+zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+shutil.rmtree(tmpeggs)
Property changes on: z3c.widget/trunk/bootstrap.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Added: z3c.widget/trunk/buildout.cfg
===================================================================
--- z3c.widget/trunk/buildout.cfg 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/buildout.cfg 2007-04-10 12:56:29 UTC (rev 74087)
@@ -0,0 +1,11 @@
+[buildout]
+develop = .
+parts = test
+
+[test]
+recipe = zc.recipe.testrunner
+defaults = ['--tests-pattern', '^f?tests$']
+eggs = z3c.widget [test]
+
+
+
Property changes on: z3c.widget/trunk/buildout.cfg
___________________________________________________________________
Name: svn:eol-style
+ native
Added: z3c.widget/trunk/setup.cfg
===================================================================
--- z3c.widget/trunk/setup.cfg 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/setup.cfg 2007-04-10 12:56:29 UTC (rev 74087)
@@ -0,0 +1,3 @@
+[egg_info]
+tag_build = dev
+tag_svn_revision = 1
Property changes on: z3c.widget/trunk/setup.cfg
___________________________________________________________________
Name: svn:eol-style
+ native
Added: z3c.widget/trunk/setup.py
===================================================================
--- z3c.widget/trunk/setup.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/setup.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -0,0 +1,49 @@
+#!python
+from setuptools import setup, find_packages
+
+setup(name='z3c.widget',
+ version='0.1dev',
+ author = "Zope Community",
+ author_email = "zope3-dev at zope.org",
+ description = "Additional Zope3 Widgets",
+ license = "ZPL 2.1",
+ keywords = "zope zope3",
+ url='http://svn.zope.org/z3c.widget',
+ zip_safe=False,
+ packages=find_packages('src'),
+ include_package_data=True,
+ package_dir = {'':'src'},
+ namespace_packages=['z3c',],
+ extras_require = dict(test=['zope.app.testing',
+ 'zope.testing',
+ 'zope.app.securitypolicy',
+ 'zope.app.zcmlfiles',
+ 'zope.testbrowser',
+ ]),
+ install_requires = ['setuptools',
+ 'ZODB3',
+ 'z3c.i18n',
+ 'z3c.javascript',
+ 'z3c.schema',
+ 'zc.resourcelibrary',
+ 'zope.app.cache',
+ 'zope.app.container',
+ 'zope.app.file',
+ 'zope.app.form',
+ 'zope.app.i18n',
+ 'zope.app.pagetemplate',
+ 'zope.component',
+ 'zope.event',
+ 'zope.filerepresentation',
+ 'zope.formlib',
+ 'zope.i18n',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.lifecycleevent',
+ 'zope.publisher',
+ 'zope.schema',
+ 'zope.security',
+ 'zope.traversing',
+ ],
+ )
+
Property changes on: z3c.widget/trunk/setup.py
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: z3c.widget/trunk/src/z3c/__init__.py
===================================================================
--- z3c.widget/trunk/src/z3c/__init__.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/__init__.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -0,0 +1,6 @@
+try:
+ # Declare this a namespace package if pkg_resources is available.
+ import pkg_resources
+ pkg_resources.declare_namespace('z3c')
+except ImportError:
+ pass
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -2,7 +2,6 @@
import unittest
from zope.testing.doctestunit import DocTestSuite
from zope.app.testing import setup
-from zope import component
def setUp(test):
setup.placefulSetUp(True)
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,12 +1,22 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope">
- <include package="zope.app" />
- <include package="zope.app.server" />
+
+ <include package="zope.app.securitypolicy" file="meta.zcml" />
+
+ <include
+ zcml:condition="installed zope.app.zcmlfiles"
+ package="zope.app.zcmlfiles"
+ />
+ <include
+ zcml:condition="not-installed zope.app.zcmlfiles"
+ package="zope.app"
+ />
<include package="zope.app.authentication" />
- <include package="zope.app.securitypolicy" file="meta.zcml" />
+
<securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+ component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
<include package="zope.app.securitypolicy" />
<include package="zc.resourcelibrary" file="meta.zcml"/>
<include package="zc.resourcelibrary" />
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -2,11 +2,6 @@
import unittest
from zope.testing.doctestunit import DocFileSuite
from zope.app.testing import setup
-from zope import component
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.schema.interfaces import ITextLine
-from zope.app.form.browser import TextWidget
-from zope.publisher.interfaces.browser import IBrowserRequest
def setUp(test):
setup.placefulSetUp(True)
Modified: z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/widget.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/widget.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,7 +1,5 @@
import datetime
-from zope.datetime import parseDatetimetz
-
from zope.app.form.browser.widget import SimpleInputWidget, renderElement
from zope.app.form.interfaces import ConversionError
from zope.app.i18n import ZopeMessageFactory as _
Modified: z3c.widget/trunk/src/z3c/widget/flashupload/ticket.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/flashupload/ticket.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/flashupload/ticket.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,6 +1,4 @@
from zope.traversing.browser.absoluteurl import absoluteURL
-import md5
-import base64
import random
from zope.app.cache.ram import RAMCache
Modified: z3c.widget/trunk/src/z3c/widget/flashupload/upload.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/flashupload/upload.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/flashupload/upload.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,5 +1,4 @@
from zope.app.container.interfaces import INameChooser
-from zope.app.container.contained import setitem
from ticket import validateTicket, invalidateTicket
from zope.security.interfaces import Unauthorized
from zope.publisher.browser import BrowserView
@@ -11,11 +10,10 @@
from zope.app.container.constraints import checkObject
from zope import event
-from i18n import _
+from z3c.widget.flashupload.interfaces import (IFlashUploadForm,
+ IUploadFileView,
+ FlashUploadedEvent)
-from z3c.widget.flashupload.interfaces import IFlashUploadForm, IUploadFileView, FlashUploadedEvent
-
-
try:
from zc import resourcelibrary
haveResourceLibrary = True
Modified: z3c.widget/trunk/src/z3c/widget/image/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/image/widget.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/image/widget.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,6 +1,6 @@
from zope.app.form.browser.widget import SimpleInputWidget
from zope.app.file.image import Image
-from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
+from zope.lifecycleevent import ObjectCreatedEvent
import zope.event
template = u"""
Modified: z3c.widget/trunk/src/z3c/widget/namespace/namespace.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/namespace/namespace.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/namespace/namespace.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,6 +1,4 @@
from zope.traversing.namespace import SimpleHandler
-from zope import component
-from zope.formlib import interfaces
from zope.security.proxy import removeSecurityProxy
class WidgetHandler(SimpleHandler):
Modified: z3c.widget/trunk/src/z3c/widget/namespace/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/namespace/tests.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/namespace/tests.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -3,7 +3,7 @@
from zope.testing.doctestunit import DocFileSuite
from zope.app.testing import setup
from zope import component
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
+from zope.app.form.interfaces import IInputWidget
from zope.schema.interfaces import ITextLine
from zope.app.form.browser import TextWidget
from zope.publisher.interfaces.browser import IBrowserRequest
Modified: z3c.widget/trunk/src/z3c/widget/sequence/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/sequence/tests.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/sequence/tests.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -18,17 +18,12 @@
import unittest
from zope.testing import doctest
from zope.schema import Tuple, List, TextLine, Object
-from zope.schema.interfaces import ITextLine, ValidationError
+from zope.schema.interfaces import ITextLine
from zope.publisher.browser import TestRequest
from zope.interface import Interface, implements
-from zope.interface.verify import verifyClass
-from zope.app import zapi
from zope.app.testing import ztapi, setup
from zope.app.form.browser import TextWidget, ObjectWidget, DisplayWidget
-#from zope.app.form.browser import TupleSequenceTableWidget, ListSequenceWidget
-#from zope.app.form.browser import SequenceDisplayWidget
-#from zope.app.form.browser import SequenceWidget
from z3c.widget.sequence.widget import (SequenceDisplayTableWidget,
TupleSequenceTableWidget,
ListSequenceTableWidget,
@@ -80,7 +75,8 @@
class SequenceWidgetTest(SequenceWidgetTestHelper, BrowserWidgetTest):
"""Documents and tests the tuple and list (sequence) widgets.
-
+
+ >>> from zope.interface.verify import verifyClass
>>> verifyClass(IInputWidget, TupleSequenceTableWidget)
True
>>> verifyClass(IInputWidget, TupleSequenceTableJSWidget)
Modified: z3c.widget/trunk/src/z3c/widget/sequence/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/sequence/widget.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/sequence/widget.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -1,8 +1,8 @@
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
from zope.i18n import translate
from zope.app import zapi
-from zope.app.form.interfaces import IDisplayWidget, IInputWidget
+from zope.app.form.interfaces import IInputWidget
from zope.app.form.browser import SequenceDisplayWidget, SequenceWidget
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
Modified: z3c.widget/trunk/src/z3c/widget/tiny/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/tiny/tests.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/tiny/tests.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -20,7 +20,7 @@
import doctest
import unittest
-from zope.testing.doctestunit import DocFileSuite, DocTestSuite
+from zope.testing.doctestunit import DocTestSuite
from zope.app.testing import setup
Modified: z3c.widget/trunk/src/z3c/widget/tiny/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/tiny/widget.py 2007-04-10 12:44:58 UTC (rev 74086)
+++ z3c.widget/trunk/src/z3c/widget/tiny/widget.py 2007-04-10 12:56:29 UTC (rev 74087)
@@ -24,7 +24,6 @@
haveResourceLibrary = False
from zope.app.form.browser import TextAreaWidget
-from zope.app.form.browser.widget import renderElement
template = """%(widget_html)s<script type="text/javascript">
tinyMCE.init({
More information about the Checkins
mailing list