[Zope-Checkins] SVN: Zope/trunk/ merging Zope211-3.4-integration
branch
Andreas Jung
andreas at andreas-jung.com
Tue Jun 26 10:07:03 EDT 2007
Log message for revision 77097:
merging Zope211-3.4-integration branch
Changed:
U Zope/trunk/doc/CHANGES.txt
_U Zope/trunk/lib/python/
U Zope/trunk/lib/python/Products/Five/event.zcml
U Zope/trunk/lib/python/Products/Five/form/tests/forms.txt
U Zope/trunk/lib/python/Products/Five/i18n.zcml
U Zope/trunk/lib/python/Products/Five/meta.zcml
U Zope/trunk/lib/python/Products/PageTemplates/www/ptEdit.zpt
D Zope/trunk/lib/python/Products/Transience/tests/testCounters.py
U Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
U Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py
U Zope/trunk/lib/python/tempstorage/tests/testTemporaryStorage.py
_U Zope/trunk/lib/python/zope/
_U Zope/trunk/lib/python/zope/app/
U Zope/trunk/setup.py
_U Zope/trunk/utilities/
-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/doc/CHANGES.txt 2007-06-26 14:07:01 UTC (rev 77097)
@@ -4,6 +4,10 @@
Change information for previous versions of Zope can be found in the
file HISTORY.txt.
+ Todo
+
+ - Fix ZClasses (once again)
+
Trunk (unreleased)
Restructuring
@@ -51,6 +55,10 @@
Features added
+ - integrated ZODB 3.8
+
+ - integraed Zope 3.4
+
- Support for using zopectl on Windows has been added. All commands are
supported and there are two Windows specific ones: install and remove,
which install or remove the Windows service. The start, stop and
@@ -97,6 +105,7 @@
Bugs Fixed
+<<<<<<< .working
- Five.browser.metaconfigure.page didn't protect names from interface
superclasses (http://www.zope.org/Collectors/Zope/2333)
@@ -139,6 +148,8 @@
XML representation for that property to show a namespace of
xmlns="None". Fixed within OFS.PropertySheets.dav__propstat.
+ - integrated theuni's additional test from 2.11 (see r73132)
+
- Relaxed requirements for context of
Products.Five.browser.pagetemplatefile.ZopeTwoPageTemplateFile,
to reduce barriers for testing renderability of views which
Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
- ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/BTrees
persistent -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/persistent
ThreadedAsync -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ThreadedAsync
transaction -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/transaction
ZEO -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZEO
ZODB -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZODB
ZopeUndo -r 68677 svn://svn.zope.org/repos/main/ZODB/branches/3.7/src/ZopeUndo
zdaemon -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/pytz
zodbcode -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zodbcode
mechanize -r 69031 svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/mechanize
docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0-zope
ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.1/src/RestrictedPython
+ ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees svn://svn.zope.org/repos/main/ZODB/trunk/src/BTrees
persistent svn://svn.zope.org/repos/main/ZODB/trunk/src/persistent
ThreadedAsync svn://svn.zope.org/repos/main/ZODB/trunk/src/ThreadedAsync
transaction svn://svn.zope.org/repos/main/ZODB/trunk/src/transaction
ZEO svn://svn.zope.org/repos/main/ZODB/trunk/src/ZEO
ZODB svn://svn.zope.org/repos/main/ZODB/trunk/src/ZODB
ZopeUndo svn://svn.zope.org/repos/main/ZODB/trunk/src/ZopeUndo
zdaemon -r 40792 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
#zodbcode svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
zodbcode svn://svn.zope.org/repos/main/zodbcode/trunk/src/zodbcode
mechanize svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0-zope
ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm
RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.1/src/RestrictedPython
Modified: Zope/trunk/lib/python/Products/Five/event.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/event.zcml 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/Five/event.zcml 2007-06-26 14:07:01 UTC (rev 77097)
@@ -1,7 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope">
<!-- Enable object event dispatcher -->
- <include package="zope.app.event" />
+ <include package="zope.component" />
<!-- Adapter giving sublocations for ObjectManagers, used
by dispatchToSublocations -->
Modified: Zope/trunk/lib/python/Products/Five/form/tests/forms.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/form/tests/forms.txt 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/Five/form/tests/forms.txt 2007-06-26 14:07:01 UTC (rev 77097)
@@ -34,7 +34,7 @@
>>> browser.open("http://localhost/test_folder_1_/ftf/+/addfieldcontent.html")
>>> print browser.headers
- Status: 200 OK
+ Status: 200 ...
...
We don't have access, we will not be able to get to the protected add form:
@@ -49,7 +49,7 @@
>>> browser.addHeader('Authorization', 'Basic manager:r00t')
>>> browser.open("http://localhost/test_folder_1_/ftf/+/protectedaddform.html")
>>> print browser.headers
- Status: 200 OK
+ Status: 200 ...
...
@@ -66,7 +66,7 @@
>>> browser.open("http://localhost/test_folder_1_/ftf/edittest")
>>> print browser.headers
- Status: 200 OK
+ Status: 200 ...
...
We can also verify that the title was set correctly, and the not
@@ -104,7 +104,7 @@
>>> ctl.value = 'BarDescription'
>>> browser.getControl(name="UPDATE_SUBMIT").click()
>>> print browser.headers
- Status: 200 OK
+ Status: 200 ...
...
>>> print browser.contents
<html>
@@ -129,7 +129,7 @@
>>> ctl.value = 'FooDescription'
>>> browser.getControl(name="UPDATE_SUBMIT").click()
>>> print browser.headers
- Status: 200 OK
+ Status: 200 ...
...
We will see that something has changed:
Modified: Zope/trunk/lib/python/Products/Five/i18n.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/i18n.zcml 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/Five/i18n.zcml 2007-06-26 14:07:01 UTC (rev 77097)
@@ -20,8 +20,8 @@
factory="zope.publisher.http.HTTPCharsets"
/>
- <configure package="zope.app">
- <i18n:registerTranslations directory="locales"/>
+ <configure package="zope.app.locales">
+ <i18n:registerTranslations directory="."/>
</configure>
</configure>
Modified: Zope/trunk/lib/python/Products/Five/meta.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/meta.zcml 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/Five/meta.zcml 2007-06-26 14:07:01 UTC (rev 77097)
@@ -75,21 +75,7 @@
</meta:complexDirective>
- <!-- BBB 2006/02/24, to be removed after 12 months -->
<meta:directive
- name="vocabulary"
- schema="zope.app.schema.metadirectives.IVocabularyDirective"
- handler="zope.app.schema.metaconfigure.vocabulary"
- />
-
- <!-- BBB 2006/02/24, to be removed after 12 months -->
- <meta:directive
- name="defaultLayer"
- schema="zope.app.component.metadirectives.IDefaultLayerDirective"
- handler="zope.app.component.metaconfigure.defaultLayer"
- />
-
- <meta:directive
name="securityPolicy"
schema="zope.security.zcml.ISecurityPolicyDirective"
handler="zope.security.zcml.securityPolicy"
Modified: Zope/trunk/lib/python/Products/PageTemplates/www/ptEdit.zpt
===================================================================
--- Zope/trunk/lib/python/Products/PageTemplates/www/ptEdit.zpt 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/PageTemplates/www/ptEdit.zpt 2007-06-26 14:07:01 UTC (rev 77097)
@@ -51,7 +51,7 @@
<pre tal:content="python:'\n'.join(errors)">errors</pre>
</td>
</tr>
-
+<!--
<tr tal:define="warnings context/pt_warnings" tal:condition="warnings">
<td align="left" valign="middle" class="form-label">Warnings</td>
<td align="left" valign="middle" style="background-color: #FFEEDD"
@@ -59,7 +59,7 @@
<pre tal:content="python:'\n'.join(warnings)">errors</pre>
</td>
</tr>
-
+-->
<tr>
<td align="left" valign="top" colspan="4"
tal:define="width request/dtpref_cols | string:100%;
Deleted: Zope/trunk/lib/python/Products/Transience/tests/testCounters.py
===================================================================
--- Zope/trunk/lib/python/Products/Transience/tests/testCounters.py 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/Products/Transience/tests/testCounters.py 2007-06-26 14:07:01 UTC (rev 77097)
@@ -1,105 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 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
-#
-##############################################################################
-
-import os
-from unittest import TestCase, TestSuite, makeSuite
-from ZODB.POSException import ConflictError
-from ZODB.FileStorage import FileStorage
-from ZODB.DB import DB
-import transaction
-
-from Products.Transience.Transience import Length2, Increaser
-
-# Test pattern is copied from BTrees/tests/testConflict.py
-
-class Base(TestCase):
- storage = None
-
- def setUp(self):
- pass
-
- def tearDown(self):
- transaction.abort()
- if self.storage is not None:
- self.storage.close()
- self.storage.cleanup()
-
- def openDB(self):
- n = 'fs_tmp__%s' % os.getpid()
- self.storage = FileStorage(n)
- self.db = DB(self.storage)
-
-class TestLength2(Base):
-
- def testConflict(self):
- # Set up database connections to provoke conflict.
- self.openDB()
- length = Length2(0)
-
- r1 = self.db.open().root()
- r1['ob'] = length
- transaction.commit()
-
- r2 = self.db.open(synch=False).root()
- copy = r2['ob']
- # The following ensures that copy is loaded.
- self.assertEqual(copy(),0)
-
- # First transaction.
- length.increment(10)
- length.decrement(1)
- transaction.commit()
-
- # Second transaction.
- length = copy
- length.increment(20)
- length.decrement(2)
- transaction.commit()
-
- self.assertEqual(length(), 10+20-max(1,2))
-
-class TestIncreaser(Base):
-
- def testConflict(self):
-
- # Set up database connections to provoke conflict.
- self.openDB()
- increaser = Increaser(0)
-
- r1 = self.db.open().root()
- r1['ob'] = increaser
- transaction.commit()
-
- r2 = self.db.open(synch=False).root()
- copy = r2['ob']
- # The following ensures that copy is loaded.
- self.assertEqual(copy(),0)
-
- # First transaction.
- increaser.set(10)
- transaction.commit()
-
-
- # Second transaction.
- increaser = copy
- increaser.set(20)
- transaction.commit()
-
- self.assertEqual(increaser(), 20)
-
-def test_suite():
- suite = TestSuite()
- suite.addTest(makeSuite(TestLength2))
- suite.addTest(makeSuite(TestIncreaser))
- return suite
Modified: Zope/trunk/lib/python/ZPublisher/HTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/ZPublisher/HTTPRequest.py 2007-06-26 14:07:01 UTC (rev 77097)
@@ -13,7 +13,7 @@
__version__='$Revision: 1.96 $'[11:-2]
-import re, sys, os, time, random, codecs, inspect
+import re, sys, os, time, random, codecs, inspect, tempfile
from types import StringType, UnicodeType
from BaseRequest import BaseRequest, quote
from HTTPResponse import HTTPResponse
@@ -395,7 +395,7 @@
taintedform=self.taintedform
meth=None
- fs=FieldStorage(fp=fp,environ=environ,keep_blank_values=1)
+ fs=ZopeFieldStorage(fp=fp,environ=environ,keep_blank_values=1)
if not hasattr(fs,'list') or fs.list is None:
# Hm, maybe it's an XML-RPC
if (fs.headers.has_key('content-type') and
@@ -1418,7 +1418,11 @@
except: pass
return dict
+class ZopeFieldStorage(FieldStorage):
+ def make_file(self, binary=None):
+ return tempfile.NamedTemporaryFile("w+b")
+
class FileUpload:
'''\
File upload objects
@@ -1443,7 +1447,7 @@
else: methods= ['close', 'fileno', 'flush', 'isatty',
'read', 'readline', 'readlines', 'seek',
'tell', 'truncate', 'write', 'writelines',
- '__iter__','next'] # see Collector 1837
+ '__iter__','next', 'name'] # see Collector 1837
d=self.__dict__
for m in methods:
Modified: Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/ZPublisher/tests/testHTTPRequest.py 2007-06-26 14:07:01 UTC (rev 77097)
@@ -1,6 +1,15 @@
import unittest
from urllib import quote_plus
+
+TEST_LARGEFILE_DATA = '''
+--12345
+Content-Disposition: form-data; name="file"; filename="file"
+Content-Type: application/octet-stream
+test %s
+
+''' % ('test' * 1000)
+
class AuthCredentialsTests( unittest.TestCase ):
def _getTargetClass(self):
@@ -684,6 +693,17 @@
req.close()
self.assertEqual(start_count, sys.getrefcount(s)) # The test
+ def testFileName(self):
+ # checks fileupload object supports the filename
+ from StringIO import StringIO
+ s = StringIO(TEST_LARGEFILE_DATA)
+ env = TEST_ENVIRON.copy()
+ from ZPublisher.HTTPRequest import HTTPRequest
+ req = HTTPRequest(s, env, None)
+ req.processInputs()
+ f = req.form.get('file')
+ self.assert_(f.name)
+
def testFileIterator(self):
# checks fileupload object supports the iterator protocol
# collector entry 1837
Modified: Zope/trunk/lib/python/tempstorage/tests/testTemporaryStorage.py
===================================================================
--- Zope/trunk/lib/python/tempstorage/tests/testTemporaryStorage.py 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/lib/python/tempstorage/tests/testTemporaryStorage.py 2007-06-26 14:07:01 UTC (rev 77097)
@@ -56,7 +56,7 @@
def doreadconflict(self, db, mvcc):
tm1 = transaction.TransactionManager()
- conn = db.open(mvcc=mvcc, transaction_manager=tm1)
+ conn = db.open(transaction_manager=tm1)
r1 = conn.root()
obj = MinPO('root')
r1["p"] = obj
@@ -66,7 +66,7 @@
# start a new transaction with a new connection
tm2 = transaction.TransactionManager()
- cn2 = db.open(mvcc=mvcc, transaction_manager=tm2)
+ cn2 = db.open(transaction_manager=tm2)
r2 = cn2.root()
self.assertEqual(r1._p_serial, r2._p_serial)
@@ -85,10 +85,6 @@
obj.child1
return obj
- def checkWithoutMVCCRaisesReadConflict(self):
- db = DB(self._storage)
- self.assertRaises(ReadConflictError, self.doreadconflict, db, False)
-
def checkWithMVCCDoesntRaiseReadConflict(self):
db = DB(self._storage)
ob = self.doreadconflict(db, True)
Property changes on: Zope/trunk/lib/python/zope
___________________________________________________________________
Name: svn:externals
- annotation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/annotation
cachedescriptors svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/cachedescriptors
component svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/component
configuration svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/configuration
contentprovider svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/contentprovider
contenttype svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/contenttype
copypastemove svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/copypastemove
datetime svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/datetime
decorator svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/decorator
deferredimport svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/deferredimport
deprecation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/deprecation
documenttemplate svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/documenttemplate
dottedname svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/dottedname
dublincore svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/dublincore
event svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/event
exceptions svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/exceptions
filerepresentation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/filerepresentation
formlib svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/formlib
hookable svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/hookable
i18n svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18n
i18nmessageid svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/i18nmessageid
index svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/index
interface svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/interface
lifecycleevent svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/lifecycleevent
location svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/location
modulealias svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/modulealias
pagetemplate svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/pagetemplate
proxy svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/proxy
publisher svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/publisher
rdb svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/rdb
schema svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/schema
security svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/security
sendmail svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/sendmail
server svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/server
size svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/size
structuredtext svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/structuredtext
tal svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tal
tales svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/tales
testbrowser svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/testbrowser
testing svn://svn.zope.org/repos/main/zope.testing/tags/3.0/src/zope/testing
thread svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/thread
traversing svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/traversing
viewlet svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/viewlet
wfmc svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/wfmc
+ annotation svn://svn.zope.org/repos/main/zope.annotation/trunk/src/zope/annotation
cachedescriptors svn://svn.zope.org/repos/main/zope.cachedescriptors/trunk/src/zope/cachedescriptors
component svn://svn.zope.org/repos/main/zope.component/trunk/src/zope/component
configuration svn://svn.zope.org/repos/main/zope.configuration/trunk/src/zope/configuration
contentprovider svn://svn.zope.org/repos/main/zope.contentprovider/trunk/src/zope/contentprovider
contenttype svn://svn.zope.org/repos/main/zope.contenttype/trunk/src/zope/contenttype
copypastemove svn://svn.zope.org/repos/main/zope.copypastemove/trunk/src/zope/copypastemove
datetime svn://svn.zope.org/repos/main/zope.datetime/trunk/src/zope/datetime
decorator svn://svn.zope.org/repos/main/zope.decorator/trunk/src/zope/decorator
deferredimport svn://svn.zope.org/repos/main/zope.deferredimport/trunk/src/zope/deferredimport
deprecation svn://svn.zope.org/repos/main/zope.deprecation/trunk/src/zope/deprecation
documenttemplate svn://svn.zope.org/repos/main/zope.documenttemplate/trunk/src/zope/documenttemplate
dottedname svn://svn.zope.org/repos/main/zope.dottedname/trunk/src/zope/dottedname
dublincore svn://svn.zope.org/repos/main/zope.dublincore/trunk/src/zope/dublincore
event svn://svn.zope.org/repos/main/zope.event/trunk/src/zope/event
exceptions svn://svn.zope.org/repos/main/zope.exceptions/trunk/src/zope/exceptions
filerepresentation svn://svn.zope.org/repos/main/zope.filerepresentation/trunk/src/zope/filerepresentation
formlib svn://svn.zope.org/repos/main/zope.formlib/trunk/src/zope/formlib
fssync svn://svn.zope.org/repos/main/zope.fssync/trunk/src/zope/fssync
hookable svn://svn.zope.org/repos/main/zope.hookable/trunk/src/zope/hookable
i18nmessageid svn://svn.zope.org/repos/main/zope.i18nmessageid/trunk/src/zope/i18nmessageid
i18n svn://svn.zope.org/repos/main/zope.i18n/trunk/src/zope/i18n
index svn://svn.zope.org/repos/main/zope.index/trunk/src/zope/index
interface svn://svn.zope.org/repos/main/zope.interface/trunk/src/zope/interface
lifecycleevent svn://svn.zope.org/repos/main/zope.lifecycleevent/trunk/src/zope/lifecycleevent
location svn://svn.zope.org/repos/main/zope.location/trunk/src/zope/location
modulealias svn://svn.zope.org/repos/main/zope.modulealias/trunk/src/zope/modulealias
pagetemplate svn://svn.zope.org/repos/main/zope.pagetemplate/trunk/src/zope/pagetemplate
proxy svn://svn.zope.org/repos/main/zope.proxy/trunk/src/zope/proxy
publisher svn://svn.zope.org/repos/main/zope.publisher/trunk/src/zope/publisher
rdb svn://svn.zope.org/repos/main/zope.rdb/trunk/src/zope/rdb
schema svn://svn.zope.org/repos/main/zope.schema/trunk/src/zope/schema
security svn://svn.zope.org/repos/main/zope.security/trunk/src/zope/security
sendmail svn://svn.zope.org/repos/main/zope.sendmail/trunk/src/zope/sendmail
sequencesort svn://svn.zope.org/repos/main/zope.sequencesort/trunk/src/zope/sequencesort
server svn://svn.zope.org/repos/main/zope.server/trunk/src/zope/server
size svn://svn.zope.org/repos/main/zope.size/trunk/src/zope/size
structuredtext svn://svn.zope.org/repos/main/zope.structuredtext/trunk/src/zope/structuredtext
tales svn://svn.zope.org/repos/main/zope.tales/trunk/src/zope/tales
tal svn://svn.zope.org/repos/main/zope.tal/trunk/src/zope/tal
testbrowser svn://svn.zope.org/repos/main/zope.testbrowser/trunk/src/zope/testbrowser
testing -r75564 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
testrecorder -r70065 svn://svn.zope.org/repos/main/zope.testrecorder/trunk/src/zope/testrecorder
thread svn://svn.zope.org/repos/main/zope.thread/trunk/src/zope/thread
traversing svn://svn.zope.org/repos/main/zope.traversing/trunk/src/zope/traversing
viewlet svn://svn.zope.org/repos/main/zope.viewlet/trunk/src/zope/viewlet
xmlpickle svn://svn.zope.org/repos/main/zope.xmlpickle/trunk/src/zope/xmlpickle
Property changes on: Zope/trunk/lib/python/zope/app
___________________________________________________________________
Name: svn:externals
- annotation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/annotation
apidoc svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/apidoc
applicationcontrol svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/applicationcontrol
appsetup svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/appsetup
authentication svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/authentication
basicskin svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/basicskin
broken svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/broken
cache svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/cache
component svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/component
container svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/container
content svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/content
content_types svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/content_types
copypastemove svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/copypastemove
datetimeutils svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/datetimeutils
debug svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/debug
decorator svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/decorator
dependable svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/dependable
dtmlpage svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/dtmlpage
dublincore svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/dublincore
error svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/error
event svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/event
exception svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/exception
file svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/file
filerepresentation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/filerepresentation
folder svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/folder
form svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/form
ftests svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/ftests
generations svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/generations
http svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/http
i18n svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/i18n
interface svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/interface
intid svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/intid
introspector svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/introspector
keyreference svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/keyreference
layers svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/layers
locales svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/locales
location svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/location
mail svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/mail
onlinehelp svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/onlinehelp
pagetemplate svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/pagetemplate
preference svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/preference
preview svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/preview
principalannotation svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/principalannotation
publication svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/publication
publisher svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/publisher
rdb svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/rdb
renderer svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/renderer
rotterdam svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/rotterdam
schema svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/schema
security svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/security
servicenames svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/servicenames
session svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/session
site svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/site
size svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/size
skins svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/skins
sqlscript svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/sqlscript
testing svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/testing
tests svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/tests
timezones svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/timezones
traversing svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/traversing
tree svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/tree
undo svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/undo
wfmc svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/wfmc
wsgi svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/wsgi
zapi svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/zapi
zopeappgenerations svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/zopeappgenerations
zptpage svn://svn.zope.org/repos/main/Zope3/branches/3.3/src/zope/app/zptpage
+ annotation svn://svn.zope.org/repos/main/zope.app.annotation/trunk/src/zope/app/annotation
apidoc svn://svn.zope.org/repos/main/zope.app.apidoc/trunk/src/zope/app/apidoc
applicationcontrol svn://svn.zope.org/repos/main/zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol
appsetup svn://svn.zope.org/repos/main/zope.app.appsetup/trunk/src/zope/app/appsetup
authentication svn://svn.zope.org/repos/main/zope.app.authentication/trunk/src/zope/app/authentication
basicskin svn://svn.zope.org/repos/main/zope.app.basicskin/trunk/src/zope/app/basicskin
boston svn://svn.zope.org/repos/main/zope.app.boston/trunk/src/zope/app/boston
broken svn://svn.zope.org/repos/main/zope.app.broken/trunk/src/zope/app/broken
cache svn://svn.zope.org/repos/main/zope.app.cache/trunk/src/zope/app/cache
catalog svn://svn.zope.org/repos/main/zope.app.catalog/trunk/src/zope/app/catalog
homefolder svn://svn.zope.org/repos/main/zope.app.homefolder/trunk/src/zope/app/homefolder
intid svn://svn.zope.org/repos/main/zope.app.intid/trunk/src/zope/app/intid
zptpage svn://svn.zope.org/repos/main/zope.app.zptpage/trunk/src/zope/app/zptpage
component svn://svn.zope.org/repos/main/zope.app.component/trunk/src/zope/app/component
container svn://svn.zope.org/repos/main/zope.app.container/trunk/src/zope/app/container
content svn://svn.zope.org/repos/main/zope.app.content/trunk/src/zope/app/content
css svn://svn.zope.org/repos/main/zope.app.css/trunk/src/zope/app/css
dav svn://svn.zope.org/repos/main/zope.app.dav/trunk/src/zope/app/dav
debug svn://svn.zope.org/repos/main/zope.app.debug/trunk/src/zope/app/debug
dependable svn://svn.zope.org/repos/main/zope.app.dependable/trunk/src/zope/app/dependable
dtmlpage svn://svn.zope.org/repos/main/zope.app.dtmlpage/trunk/src/zope/app/dtmlpage
error svn://svn.zope.org/repos/main/zope.app.error/trunk/src/zope/app/error
exception svn://svn.zope.org/repos/main/zope.app.exception/trunk/src/zope/app/exception
externaleditor svn://svn.zope.org/repos/main/zope.app.externaleditor/trunk/src/zope/app/externaleditor
file svn://svn.zope.org/repos/main/zope.app.file/trunk/src/zope/app/file
folder svn://svn.zope.org/repos/main/zope.app.folder/trunk/src/zope/app/folder
form svn://svn.zope.org/repos/main/zope.app.form/trunk/src/zope/app/form
fssync svn://svn.zope.org/repos/main/zope.app.fssync/trunk/src/zope/app/fssync
ftp svn://svn.zope.org/repos/main/zope.app.ftp/trunk/src/zope/app/ftp
generations svn://svn.zope.org/repos/main/zope.app.generations/trunk/src/zope/app/generations
http svn://svn.zope.org/repos/main/zope.app.http/trunk/src/zope/app/http
i18n svn://svn.zope.org/repos/main/zope.app.i18n/trunk/src/zope/app/i18n
i18nfile svn://svn.zope.org/repos/main/zope.app.i18nfile/trunk/src/zope/app/i18nfile
interface svn://svn.zope.org/repos/main/zope.app.interface/trunk/src/zope/app/interface
interpreter svn://svn.zope.org/repos/main/zope.app.interpreter/trunk/src/zope/app/interpreter
keyreference svn://svn.zope.org/repos/main/zope.app.keyreference/trunk/src/zope/app/keyreference
layers svn://svn.zope.org/repos/main/zope.app.layers/trunk/src/zope/app/layers
locales svn://svn.zope.org/repos/main/zope.app.locales/trunk/src/zope/app/locales
locking svn://svn.zope.org/repos/main/zope.app.locking/trunk/src/zope/app/locking
module svn://svn.zope.org/repos/main/zope.app.module/trunk/src/zope/app/module
onlinehelp svn://svn.zope.org/repos/main/zope.app.onlinehelp/trunk/src/zope/app/onlinehelp
pagetemplate svn://svn.zope.org/repos/main/zope.app.pagetemplate/trunk/src/zope/app/pagetemplate
pluggableauth svn://svn.zope.org/repos/main/zope.app.pluggableauth/trunk/src/zope/app/pluggableauth
preference svn://svn.zope.org/repos/main/zope.app.preference/trunk/src/zope/app/preference
preview svn://svn.zope.org/repos/main/zope.app.preview/trunk/src/zope/app/preview
principalannotation svn://svn.zope.org/repos/main/zope.app.principalannotation/trunk/src/zope/app/principalannotation
publication svn://svn.zope.org/repos/main/zope.app.publication/trunk/src/zope/app/publication
publisher svn://svn.zope.org/repos/main/zope.app.publisher/trunk/src/zope/app/publisher
renderer svn://svn.zope.org/repos/main/zope.app.renderer/trunk/src/zope/app/renderer
rotterdam svn://svn.zope.org/repos/main/zope.app.rotterdam/trunk/src/zope/app/rotterdam
schema svn://svn.zope.org/repos/main/zope.app.schema/trunk/src/zope/app/schema
security svn://svn.zope.org/repos/main/zope.app.security/trunk/src/zope/app/security
securitypolicy svn://svn.zope.org/repos/main/zope.app.securitypolicy/trunk/src/zope/app/securitypolicy
server svn://svn.zope.org/repos/main/zope.app.server/trunk/src/zope/app/server
session svn://svn.zope.org/repos/main/zope.app.session/trunk/src/zope/app/session
skins svn://svn.zope.org/repos/main/zope.app.skins/trunk/src/zope/app/skins
sqlscript svn://svn.zope.org/repos/main/zope.app.sqlscript/trunk/src/zope/app/sqlscript
testing svn://svn.zope.org/repos/main/zope.app.testing/trunk/src/zope/app/testing
traversing svn://svn.zope.org/repos/main/zope.app.traversing/trunk/src/zope/app/traversing
tree svn://svn.zope.org/repos/main/zope.app.tree/trunk/src/zope/app/tree
twisted svn://svn.zope.org/repos/main/zope.app.twisted/trunk/src/zope/app/twisted
undo svn://svn.zope.org/repos/main/zope.app.undo/trunk/src/zope/app/undo
wsgi svn://svn.zope.org/repos/main/zope.app.wsgi/trunk/src/zope/app/wsgi
xmlrpcintrospection svn://svn.zope.org/repos/main/zope.app.xmlrpcintrospection/trunk/src/zope/app/xmlrpcintrospection
zapi svn://svn.zope.org/repos/main/zope.app.zapi/trunk/src/zope/app/zapi
zcmlfiles svn://svn.zope.org/repos/main/zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles
zopeappgenerations svn://svn.zope.org/repos/main/zope.app.zopeappgenerations/trunk/src/zope/app/zopeappgenerations
tests svn://svn.zope.org/repos/main/zope.app.tests/trunk/src/zope/app/tests
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py 2007-06-26 14:03:20 UTC (rev 77096)
+++ Zope/trunk/setup.py 2007-06-26 14:07:01 UTC (rev 77097)
@@ -307,29 +307,6 @@
'ExtensionClass/pickle/pickle.c',
'Acquisition/Acquisition.h']),
- # BTrees
- Extension(name='BTrees._OOBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- sources=['BTrees/_OOBTree.c']),
- Extension(name='BTrees._OIBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- sources=['BTrees/_OIBTree.c']),
- Extension(name='BTrees._IIBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IIBTree.c']),
- Extension(name='BTrees._IOBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IOBTree.c']),
- Extension(name='BTrees._IFBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_IFBTree.c']),
- Extension(name='BTrees._fsBTree',
- include_dirs=EXTENSIONCLASS_INCLUDEDIRS+['persistent'],
- define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
- sources=['BTrees/_fsBTree.c']),
# DocumentTemplate
Extension(name='DocumentTemplate.cDocumentTemplate',
@@ -413,9 +390,6 @@
Extension(name = 'persistent.TimeStamp',
sources= ['persistent/TimeStamp.c']
),
- Extension(name = 'ZODB.winlock',
- sources = ['ZODB/winlock.c']
- ),
#zope
Extension("zope.proxy._zope_proxy_proxy",
@@ -457,6 +431,51 @@
]
+# BTree extension modules (code borrowed from ZODB/setup.py)
+
+# Include directories for C extensions
+include = ['.']
+
+# Set up dependencies for the BTrees package
+base_btrees_depends = [
+ "BTrees/BTreeItemsTemplate.c",
+ "BTrees/BTreeModuleTemplate.c",
+ "BTrees/BTreeTemplate.c",
+ "BTrees/BucketTemplate.c",
+ "BTrees/MergeTemplate.c",
+ "BTrees/SetOpTemplate.c",
+ "BTrees/SetTemplate.c",
+ "BTrees/TreeSetTemplate.c",
+ "BTrees/sorters.c",
+ "persistent/cPersistence.h",
+ ]
+
+_flavors = {"O": "object", "I": "int", "F": "float", 'L': 'int'}
+
+KEY_H = "BTrees/%skeymacros.h"
+VALUE_H = "BTrees/%svaluemacros.h"
+
+def BTreeExtension(flavor):
+ key = flavor[0]
+ value = flavor[1]
+ name = "BTrees._%sBTree" % flavor
+ sources = ["BTrees/_%sBTree.c" % flavor]
+ kwargs = {"include_dirs": include}
+ if flavor != "fs":
+ kwargs["depends"] = (base_btrees_depends + [KEY_H % _flavors[key],
+ VALUE_H % _flavors[value]])
+ else:
+ kwargs["depends"] = base_btrees_depends
+ if key != "O":
+ kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
+ return Extension(name, sources, **kwargs)
+
+ext_modules += [BTreeExtension(flavor)
+ for flavor in ("OO", "IO", "OI", "II", "IF",
+ "fs", "LO", "OL", "LL", "LF",
+ )]
+
+
# We're using the module docstring as the distutils descriptions.
doclines = __doc__.split("\n")
@@ -509,16 +528,12 @@
"utilities/requestprofiler.py", "utilities/zpasswd.py",
"utilities/copyzopeskel.py", "utilities/reindex_catalog.py",
"utilities/compilezpy.py", "utilities/decompilezpy.py",
- "utilities/ZODBTools/timeout.py", "utilities/ZODBTools/analyze.py",
+ "utilities/ZODBTools/analyze.py",
"utilities/ZODBTools/checkbtrees.py", "utilities/ZODBTools/fsdump.py",
"utilities/ZODBTools/fsrefs.py" , "utilities/ZODBTools/fstail.py",
"utilities/ZODBTools/fstest.py", "utilities/ZODBTools/migrate.py",
- "utilities/ZODBTools/netspace.py", "utilities/ZODBTools/parsezeolog.py",
+ "utilities/ZODBTools/netspace.py", "utilities/ZODBTools/zodbload.py",
"utilities/ZODBTools/repozo.py", "utilities/ZODBTools/space.py",
- "utilities/ZODBTools/timeout.py", "utilities/ZODBTools/zeopack.py",
- "utilities/ZODBTools/zeoqueue.py", "utilities/ZODBTools/zeoreplay.py",
- "utilities/ZODBTools/zeoserverlog.py", "utilities/ZODBTools/zeoup.py",
- "utilities/ZODBTools/zodbload.py",
"test.py"],
distclass=ZopeDistribution,
)
Property changes on: Zope/trunk/utilities
___________________________________________________________________
Name: svn:externals
- ZODBTools -r 41153 svn://svn.zope.org/repos/main/ZODB/branches/3.6/src/scripts
+ ZODBTools svn://svn.zope.org/repos/main/ZODB/trunk/src/ZODB/scripts
More information about the Zope-Checkins
mailing list