[Checkins] SVN: zope.html/trunk/ Update package data and update
code t work with packages in Zope 3.4
Stephan Richter
srichter at cosmos.phy.tufts.edu
Sat Nov 3 01:18:19 EDT 2007
Log message for revision 81422:
Update package data and update code t work with packages in Zope 3.4
KGS.
Changed:
A zope.html/trunk/CHANGES.txt
A zope.html/trunk/README.txt
A zope.html/trunk/bootstrap.py
U zope.html/trunk/buildout.cfg
U zope.html/trunk/setup.py
_U zope.html/trunk/src/
U zope.html/trunk/src/zope/html/browser.py
U zope.html/trunk/src/zope/html/docinfo.txt
U zope.html/trunk/src/zope/html/ftesting.zcml
U zope.html/trunk/src/zope/html/tests.py
-=-
Added: zope.html/trunk/CHANGES.txt
===================================================================
--- zope.html/trunk/CHANGES.txt (rev 0)
+++ zope.html/trunk/CHANGES.txt 2007-11-03 05:18:18 UTC (rev 81422)
@@ -0,0 +1,16 @@
+=======
+CHANGES
+=======
+
+1.0.1 (2007-11-02)
+------------------
+
+- Package data update.
+
+- Updated code to work with packages in Zope 3.4 release.
+
+
+1.0.0 (2007-10-29)
+------------------
+
+- Initial release.
Property changes on: zope.html/trunk/CHANGES.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: zope.html/trunk/README.txt
===================================================================
--- zope.html/trunk/README.txt (rev 0)
+++ zope.html/trunk/README.txt 2007-11-03 05:18:18 UTC (rev 81422)
@@ -0,0 +1,5 @@
+This package contains support for editing HTML and XHTML inside a web
+page using the FCKeditor as a widget. This is a fairly simple
+application of FCKeditor, and simply instantiates a pre-configured
+editor for each widget. There are no options to control the editors
+individually.
Property changes on: zope.html/trunk/README.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: zope.html/trunk/bootstrap.py
===================================================================
--- zope.html/trunk/bootstrap.py (rev 0)
+++ zope.html/trunk/bootstrap.py 2007-11-03 05:18:18 UTC (rev 81422)
@@ -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: zope.html/trunk/bootstrap.py
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: zope.html/trunk/buildout.cfg
===================================================================
--- zope.html/trunk/buildout.cfg 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/buildout.cfg 2007-11-03 05:18:18 UTC (rev 81422)
@@ -1,7 +1,11 @@
[buildout]
-develop = .
+develop = . ../zope.app.testing
parts = test
+versions = versions
[test]
recipe = zc.recipe.testrunner
-eggs = zope.html
+eggs = zope.html [test]
+
+[versions]
+ZODB3 = 3.8.0b4
Modified: zope.html/trunk/setup.py
===================================================================
--- zope.html/trunk/setup.py 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/setup.py 2007-11-03 05:18:18 UTC (rev 81422)
@@ -1,35 +1,90 @@
+##############################################################################
+#
+# 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.
+#
+##############################################################################
+"""Setup for zope.html package
+
+$Id: setup.py 80818 2007-10-11 04:06:12Z srichter $
+"""
+import os
from setuptools import setup, find_packages
-setup(
- name="zope.html",
- version="1.0.1dev",
- packages=find_packages('src'),
- package_dir={'':'src'},
- namespace_packages=['zope'],
- include_package_data=True,
- install_requires=[
- 'pytz',
- 'setuptools',
- 'zc.resourcelibrary',
- 'ZODB3',
- 'zope.annotation',
- 'zope.app.authentication',
- 'zope.app.debugskin',
- 'zope.app.form',
- 'zope.app.server',
- 'zope.app.testing',
- 'zope.app.zcmlfiles',
- 'zope.component',
- 'zope.event',
- 'zope.file',
- 'zope.formlib',
- 'zope.i18nmessageid',
- 'zope.interface',
- 'zope.lifecycleevent',
- 'zope.mimetype',
- 'zope.publisher',
- 'zope.schema',
- 'zope.testing',
- ],
- zip_safe=False,
- )
+def read(*rnames):
+ return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+
+setup(name='zope.html',
+ version = '1.0.1',
+ author='Zope Corporation and Contributors',
+ author_email='zope3-dev at zope.org',
+ description='HTML and XHTML Editing Support',
+ long_description=(
+ read('README.txt')
+ + '\n\n' +
+ 'Detailed Documentation\n' +
+ '======================\n\n'
+ + '\n\n' +
+ read('src', 'zope', 'html', 'README.txt')
+ + '\n\n' +
+ read('src', 'zope', 'html', 'docinfo.txt')
+ + '\n\n' +
+ read('src', 'zope', 'html', 'widget.txt')
+ + '\n\n' +
+ read('src', 'zope', 'html', 'browser.txt')
+ + '\n\n' +
+ read('CHANGES.txt')
+ ),
+ keywords = "zope3 html widget fsck editor",
+ classifiers = [
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Web Environment',
+ 'Intended Audience :: Developers',
+ 'License :: OSI Approved :: Zope Public License',
+ 'Programming Language :: Python',
+ 'Natural Language :: English',
+ 'Operating System :: OS Independent',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Framework :: Zope3'],
+ url='http://cheeseshop.python.org/pypi/zope.html',
+ license='ZPL 2.1',
+ packages=find_packages('src'),
+ package_dir = {'': 'src'},
+ namespace_packages=['zope'],
+ extras_require = dict(
+ test=['zope.app.authentication',
+ 'zope.app.debugskin',
+ 'zope.app.server',
+ 'zope.app.testing',
+ 'zope.app.zcmlfiles',
+ 'zope.testing',
+ 'zope.testbrowser',
+ ]),
+ install_requires=[
+ 'pytz',
+ 'setuptools',
+ 'zc.resourcelibrary',
+ 'ZODB3',
+ 'zope.annotation',
+ 'zope.app.form',
+ 'zope.component',
+ 'zope.event',
+ 'zope.file',
+ 'zope.formlib',
+ 'zope.i18nmessageid',
+ 'zope.interface',
+ 'zope.lifecycleevent',
+ 'zope.mimetype',
+ 'zope.publisher',
+ 'zope.schema',
+ ],
+ include_package_data = True,
+ zip_safe = False,
+ )
Property changes on: zope.html/trunk/src
___________________________________________________________________
Name: svn:ignore
+ zope.html.egg-info
Modified: zope.html/trunk/src/zope/html/browser.py
===================================================================
--- zope.html/trunk/src/zope/html/browser.py 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/src/zope/html/browser.py 2007-11-03 05:18:18 UTC (rev 81422)
@@ -37,7 +37,7 @@
def get_rendered_text(form):
- f = form.context.open("rb")
+ f = form.context.open("r")
data = f.read()
f.close()
ci = mimetype.interfaces.IContentInfo(form.context)
@@ -202,7 +202,7 @@
self.form_reset = False
return False
# need to discard re-encode checkbox
- f = self.context.open("wb")
+ f = self.context.open("w")
f.write(textdata)
f.close()
return True
Modified: zope.html/trunk/src/zope/html/docinfo.txt
===================================================================
--- zope.html/trunk/src/zope/html/docinfo.txt 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/src/zope/html/docinfo.txt 2007-11-03 05:18:18 UTC (rev 81422)
@@ -26,9 +26,8 @@
... zope.annotation.IAttributeAnnotatable)
...
... def __init__(self, text=None):
- ... self.mimeType = "text/html"
- ... self.parameters = {"charset": "utf-8"}
- ... f = self.open("wb")
+ ... super(File, self).__init__("text/html", {"charset": "utf-8"})
+ ... f = self.open("w")
... f.write(text)
... f.close()
Modified: zope.html/trunk/src/zope/html/ftesting.zcml
===================================================================
--- zope.html/trunk/src/zope/html/ftesting.zcml 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/src/zope/html/ftesting.zcml 2007-11-03 05:18:18 UTC (rev 81422)
@@ -1,4 +1,4 @@
-<configure
+<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:zcml="http://namespaces.zope.org/zcml"
@@ -24,7 +24,7 @@
<authenticatedGroup
id="zope.Authenticated"
- title="Everybody"
+ title="Everybody"
/>
<unauthenticatedPrincipal
Modified: zope.html/trunk/src/zope/html/tests.py
===================================================================
--- zope.html/trunk/src/zope/html/tests.py 2007-11-03 01:42:48 UTC (rev 81421)
+++ zope.html/trunk/src/zope/html/tests.py 2007-11-03 05:18:18 UTC (rev 81422)
@@ -27,6 +27,7 @@
import zope.app.form.browser.tests.test_textareawidget
import zope.app.testing.placelesssetup
import zope.component
+import zope.file.testing
import zope.interface.common.idatetime
import zope.mimetype.types
import zope.publisher.interfaces
@@ -59,13 +60,13 @@
def requestToTZInfo(request):
return pytz.timezone('US/Eastern')
-EditableHtmlLayer = functional.ZCMLLayer(
+EditableHtmlLayer = zope.file.testing.ZCMLLayer(
os.path.join(os.path.dirname(__file__), 'ftesting.zcml'),
__name__, "EditableHtmlLayer")
def test_suite():
- ftests = functional.FunctionalDocFileSuite("browser.txt")
+ ftests = zope.file.testing.FunctionalBlobDocFileSuite("browser.txt")
ftests.layer = EditableHtmlLayer
return unittest.TestSuite([
doctest.DocFileSuite(
More information about the Checkins
mailing list