[Zodb-checkins] CVS: ZODB3 - test.py:1.26.2.1 setup.py:1.51.2.2 README.txt:1.20.2.1 NEWS.txt:1.34.2.1 Makefile:1.6.12.1 MANIFEST.in:1.11.2.1 MANIFEST:1.17.2.1

Jeremy Hylton jeremy at zope.com
Tue Dec 23 14:06:29 EST 2003


Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv26665

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	test.py setup.py README.txt NEWS.txt Makefile MANIFEST.in 
	MANIFEST 
Log Message:
Merge the head to the mvcc branch.

This merge should be the final preparation for merging the branch to
the trunk.


=== ZODB3/test.py 1.26 => 1.26.2.1 ===
--- ZODB3/test.py:1.26	Thu Oct  2 14:17:32 2003
+++ ZODB3/test.py	Tue Dec 23 14:06:28 2003
@@ -145,6 +145,7 @@
 import sys
 import time
 import errno
+import logging
 import tempfile
 import unittest
 import traceback
@@ -532,7 +533,16 @@
         self.type2count = type2count
         self.type2all = type2all
 
+class TestHandler(logging.Handler):
+
+    def emit(self, rec):
+        if rec.exc_info:
+            print "ERROR"
+            print rec
+
 def runner(files, test_filter, debug):
+##    handler = TestHandler(logging.INFO)
+##    logging.root.addHandler(handler)
     runner = ImmediateTestRunner(verbosity=VERBOSE, debug=debug,
                                  progress=progress)
     suite = unittest.TestSuite()
@@ -581,15 +591,15 @@
     # Initialize the path and cwd
     pathinit = PathInit(build, build_inplace, libdir)
 
-    # Initialize the logging module.
-    import logging.config
-    logging.basicConfig()
-    level = os.getenv("LOGGING")
-    if level:
-        level = int(level)
-    else:
-        level = logging.CRITICAL
-    logging.root.setLevel(level)
+##    # Initialize the logging module.
+##    import logging.config
+##    logging.basicConfig()
+##    level = os.getenv("LOGGING")
+##    if level:
+##        level = int(level)
+##    else:
+##        level = logging.CRITICAL
+##    logging.root.setLevel(level)
 
     files = find_tests(module_filter)
     files.sort()


=== ZODB3/setup.py 1.51.2.1 => 1.51.2.2 ===
--- ZODB3/setup.py:1.51.2.1	Tue Oct  7 14:16:30 2003
+++ ZODB3/setup.py	Tue Dec 23 14:06:28 2003
@@ -21,7 +21,7 @@
 """
 
 classifiers = """\
-Development Status :: 5 - Production/Stable
+Development Status :: 3 - Alpha
 Intended Audience :: Developers
 License :: OSI Approved :: Zope Public License
 Programming Language :: Python
@@ -42,37 +42,12 @@
 from distutils.command.install_lib import install_lib
 from distutils.command.build_py import build_py
 
-# distutils doesn't currently support graceful future evolution,
-# because all commands are configured by keyword args and distutils
-# complains about keywords it doesn't know about.
-
-if not "depends" in Extension.__init__.func_code.co_varnames:
-    # If it doesn't, create a local replacement that removes depends from the
-    # kwargs before calling the regular constructor.
-    _Extension = Extension
-    class Extension(_Extension):
-        def __init__(self, name, sources, **kwargs):
-            if kwargs.has_key("depends"):
-                del kwargs["depends"]
-            _Extension.__init__(self, name, sources, **kwargs)
-
 if sys.version_info < (2, 3):
-    _setup = setup
-    def setup(**kwargs):
-        if kwargs.has_key("classifiers"):
-            del kwargs["classifiers"]
-        _setup(**kwargs)
-
-def ExtClassExt(name):
-    """Return an Extension object for something in ExtensionClass/src."""
-    return Extension(name=name, sources=["ExtensionClass/src/%s.c" % name])
-
-exts = [ExtClassExt(name) for name in
-        ["ExtensionClass", "Acquisition", "ComputedAttribute", "MethodObject",
-         "Missing", "MultiMapping", "Record", "ThreadLock"]]
+    print "ZODB3 3.3 requires Python 2.3 or higher"
+    sys.exit(0)
 
 # Include directories for C extensions
-include = ['ExtensionClass/src', 'ZODB']
+include = ['persistent']
 
 # Set up dependencies for the BTrees package
 base_btrees_depends = [
@@ -85,6 +60,7 @@
     "BTrees/SetTemplate.c",
     "BTrees/TreeSetTemplate.c",
     "BTrees/sorters.c",
+    "persistent/cPersistence.h",
     ]
 
 _flavors = {"O": "object", "I": "int"}
@@ -105,22 +81,29 @@
         kwargs["define_macros"] = [('EXCLUDE_INTSET_SUPPORT', None)]
     return Extension(name, sources, **kwargs)
 
-exts += [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
+exts = [BTreeExtension(flavor) for flavor in ["OO", "IO", "OI", "II", "fs"]]
 
-cPersistence = Extension(name = 'ZODB.cPersistence',
+cPersistence = Extension(name = 'persistent.cPersistence',
                          include_dirs = include,
-                         sources= ['ZODB/cPersistence.c']
+                         sources= ['persistent/cPersistence.c',
+                                   'persistent/ring.c'],
+                         depends = ['persistent/cPersistence.h',
+                                    'persistent/ring.h',
+                                    'persistent/ring.c']
                          )
 
-cPickleCache = Extension(name = 'ZODB.cPickleCache',
+cPickleCache = Extension(name = 'persistent.cPickleCache',
                          include_dirs = include,
-                         sources= ['ZODB/cPickleCache.c']
+                         sources= ['persistent/cPickleCache.c',
+                                   'persistent/ring.c'],
+                         depends = ['persistent/cPersistence.h',
+                                    'persistent/ring.h',
+                                    'persistent/ring.c']
                          )
 
-TimeStamp = Extension(name = 'ZODB.TimeStamp',
-                      define_macros = [('USE_EXTENSION_CLASS', 1)],
+TimeStamp = Extension(name = 'persistent.TimeStamp',
                       include_dirs = include,
-                      sources= ['ZODB/TimeStamp.c']
+                      sources= ['persistent/TimeStamp.c']
                       )
 
 coptimizations = Extension(name = 'ZODB.coptimizations',
@@ -135,28 +118,24 @@
 
 exts += [cPersistence, cPickleCache, TimeStamp, coptimizations, winlock]
 
-# Don't build the helper unless using at least Python 2.2
-if sys.version_info >= (2, 2) or "sdist" in sys.argv:
-    bsddbhelper = Extension(name = 'BDBStorage._helper',
-                            sources = ['BDBStorage/_helper.c'])
-    exts += [bsddbhelper]
+bsddbhelper = Extension(name = 'BDBStorage._helper',
+                        sources = ['BDBStorage/_helper.c'])
+exts += [bsddbhelper]
 
 packages = ["BDBStorage", "BDBStorage.tests",
             "BTrees", "BTrees.tests",
             "ZEO", "ZEO.auth", "ZEO.zrpc", "ZEO.tests",
-            "ZODB",  "ZODB.FileStorage", "ZODB.tests",
-            "Persistence",
+            "ZODB", "ZODB.FileStorage", "ZODB.tests",
+            "Persistence", "Persistence.tests",
+            "persistent", "persistent.tests",
             "ThreadedAsync",
             "zLOG", "zLOG.tests",
             "zdaemon", "zdaemon.tests",
             "ZopeUndo", "ZopeUndo.tests",
             "ZConfig", "ZConfig.tests",
+            "ZConfig.tests.library", "ZConfig.tests.library.widget",
+            "ZConfig.tests.library.thing",
             ]
-package_dir = {'BDBStorage': 'BDBStorage'}
-
-# include in a source distribution and
-if sys.version_info < (2, 3) or "sdist" in sys.argv:
-    packages.append("logging")
 
 scripts = ["Tools/fsdump.py",
            "Tools/fsrefs.py",
@@ -166,6 +145,7 @@
            "Tools/zeopack.py",
            "ZConfig/scripts/zconfig",
            "ZEO/runzeo.py",
+           "ZEO/zeopasswd.py",
            "ZEO/mkzeoinst.py",
            "zdaemon/zdrun.py",
            "zdaemon/zdctl.py",
@@ -176,7 +156,7 @@
         os.path.join("ZConfig", "tests", "input"),
         os.path.join("ZConfig", "tests", "library"),
         os.path.join("ZConfig", "tests", "library", "thing"),
-        os.path.join("ZConfig", "tests", "library", "thing", "ext"),
+        os.path.join("ZConfig", "tests", "library", "thing", "extras"),
         os.path.join("ZConfig", "tests", "library", "widget"),
         "ZEO",
         "ZODB",
@@ -193,6 +173,7 @@
 
 class MyLibInstaller(install_lib):
     """Custom library installer, used to put hosttab in the right place."""
+
     # We use the install_lib command since we need to put hosttab
     # inside the library directory.  This is where we already have the
     # real information about where to install it after the library
@@ -221,14 +202,14 @@
 doclines = __doc__.split("\n")
 
 setup(name="ZODB3",
-      version="3.2c1",
+      version="3.3a2",
       maintainer="Zope Corporation",
       maintainer_email="zodb-dev at zope.org",
-      url = "http://www.zope.org/Wikis/ZODB/FrontPage",
+      url = "http://www.zope.org/Wikis/ZODB",
+      download_url = "http://www.zope.org/Products/ZODB3.3",
       packages = packages,
-      package_dir = package_dir,
       ext_modules = exts,
-      headers = ['ExtensionClass/src/ExtensionClass.h', 'ZODB/cPersistence.h'],
+      headers = ['persistent/cPersistence.h'],
       license = "http://www.zope.org/Resources/ZPL",
       platforms = ["any"],
       description = doclines[0],


=== ZODB3/README.txt 1.20 => 1.20.2.1 ===
--- ZODB3/README.txt:1.20	Thu Oct  2 14:17:32 2003
+++ ZODB3/README.txt	Tue Dec 23 14:06:28 2003
@@ -96,7 +96,7 @@
     Type "help", "copyright", "credits" or "license" for more information.
     >>> import ZODB
     >>> ZODB.__version__
-    '3.2c1'
+    '3.3a0'
 
 Testing
 -------


=== ZODB3/NEWS.txt 1.34 => 1.34.2.1 ===
--- ZODB3/NEWS.txt:1.34	Thu Oct  2 14:17:32 2003
+++ ZODB3/NEWS.txt	Tue Dec 23 14:06:28 2003
@@ -1,3 +1,40 @@
+What's new in ZODB3 3.3
+=======================
+Release-date: XX-XXX-2003
+
+Changed the ZEO server and control process to work with a single
+configuration file; this is now the default way to configure these
+processes.  (It's still possible to use separate configuration files.)
+The ZEO configuration file can now include a "runner" section used by
+the control process and ignored by the ZEO server process itself.  If
+present, the control process can use the same configuration file.
+
+Fixed a performance problem in the logging code for the ZEO protocol.
+The logging code could call repr() on arbitrarily long lists, even
+though it only logged the first 60 bytes; worse, it calls repr() even
+if logging is currently disabled.  Fixed to call repr() on individual
+elements until the limit is reached.
+
+ReadConflictError objects now have an ignore() method.  Normally, a
+transaction that causes a read conflict can't be committed.  If the
+exception is caught and its ignore() method called, the transaction
+can be committed.  Application code may need this in advanced
+applications.
+
+Fixed a bug in zrpc (when using authentication) where the MAC header
+wasn't being read for large messages, generating errors while unpickling
+commands sent over the wire. Also fixed the zeopasswd.py script, added
+testcases and provided a more complete commandline interface.
+
+The prefix used for log messages from runzeo.py was changed from
+RUNSVR to RUNZEO.
+
+What's new in ZODB3 3.2
+========================
+Release date: 08-Oct-2003
+
+Nothing has changed since release candidate 1.
+
 What's new in ZODB3 3.2 release candidate 1
 ===========================================
 Release date: 01-Oct-2003
@@ -108,7 +145,7 @@
 The code could raise RuntimeWarning under Python 2.3, and produce
 incorrect results on 64-bit platforms.
 
-Fixed bug in BDBStorage that cause lead to DBRunRecoveryErrors when a
+Fixed bug in BDBStorage that could lead to DBRunRecoveryErrors when a
 transaction was aborted after performing operations like commit
 version or undo that create new references to existing pickles.
 


=== ZODB3/Makefile 1.6 => 1.6.12.1 ===
--- ZODB3/Makefile:1.6	Tue Apr 22 14:42:53 2003
+++ ZODB3/Makefile	Tue Dec 23 14:06:28 2003
@@ -1,18 +1,14 @@
-PYTHON=python2.2
-ALTPYTHON=python2.1
+PYTHON=python2.3
 
 all:
 	$(PYTHON) setup.py -q build
-	$(ALTPYTHON) setup.py -q build
 
 install: all
 	$(PYTHON) setup.py -q install
-	$(ALTPYTHON) setup.py -q install
 
 TESTOPTS=
 test: all
 	$(PYTHON) test.py -v $(TESTOPTS)
-	$(ALTPYTHON) test.py -v $(TESTOPTS)
 
 clean:
 	-rm -rf build


=== ZODB3/MANIFEST.in 1.11 => 1.11.2.1 ===
--- ZODB3/MANIFEST.in:1.11	Thu Oct  2 14:17:32 2003
+++ ZODB3/MANIFEST.in	Tue Dec 23 14:06:28 2003
@@ -1,7 +1,8 @@
 include MANIFEST*
 include *.txt
 include test.py
-recursive-include ZODB *.h .c *.xml
+recursive-include persistent *.h *.c
+recursive-include ZODB .c *.xml
 recursive-include BTrees *.h .c *.txt
 recursive-include BDBStorage *.c
 recursive-include ZEO *.xml *.txt
@@ -10,7 +11,6 @@
 recursive-include ZConfig *.xml *.conf
 include ZConfig/scripts/zconfig
 graft Doc
-graft ExtensionClass
 graft Tools
 graft ZConfig/doc
 global-exclude .cvsignore


=== ZODB3/MANIFEST 1.17 => 1.17.2.1 ===
--- ZODB3/MANIFEST:1.17	Thu Oct  2 14:17:32 2003
+++ ZODB3/MANIFEST	Tue Dec 23 14:06:28 2003
@@ -57,7 +57,9 @@
 BTrees/tests/testBTreesUnicode.py
 BTrees/tests/testConflict.py
 BTrees/tests/testSetOps.py
+BTrees/tests/test_btreesubclass.py
 BTrees/tests/test_check.py
+BTrees/tests/test_compare.py
 Doc/ACKS
 Doc/BDBStorage.txt
 Doc/Makefile
@@ -109,53 +111,12 @@
 Doc/zodb/zeo.html
 Doc/zodb/zodb.css
 Doc/zodb/zodb.html
-ExtensionClass/LICENSE.txt
-ExtensionClass/README
-ExtensionClass/Xaq.py
-ExtensionClass/setup.py
-ExtensionClass/doc/Acquisition.html
-ExtensionClass/doc/Acquisition.stx
-ExtensionClass/doc/ExtensionClass.html
-ExtensionClass/doc/ExtensionClass.stx
-ExtensionClass/doc/Installation
-ExtensionClass/doc/Installation.html
-ExtensionClass/doc/MultiMapping.html
-ExtensionClass/doc/MultiMapping.stx
-ExtensionClass/doc/index.html
-ExtensionClass/doc/index.stx
-ExtensionClass/doc/release.notes
-ExtensionClass/doc/release.notes.html
-ExtensionClass/src/Acquisition.c
-ExtensionClass/src/Acquisition.h
-ExtensionClass/src/ComputedAttribute.c
-ExtensionClass/src/ExtensionClass.c
-ExtensionClass/src/ExtensionClass.h
-ExtensionClass/src/MethodObject.c
-ExtensionClass/src/Missing.c
-ExtensionClass/src/MultiMapping.c
-ExtensionClass/src/Record.c
-ExtensionClass/src/ThreadLock.c
-ExtensionClass/src/Xaq.py
-ExtensionClass/test/regrtest.py
-ExtensionClass/test/test_AqAlg.py
-ExtensionClass/test/test_Missing.py
-ExtensionClass/test/test_MultiMapping.py
-ExtensionClass/test/test_ThreadLock.py
-ExtensionClass/test/test_acquisition.py
-ExtensionClass/test/test_add.py
-ExtensionClass/test/test_binding.py
-ExtensionClass/test/test_explicit_acquisition.py
-ExtensionClass/test/test_method_hook.py
-ExtensionClass/test/output/test_AqAlg
-ExtensionClass/test/output/test_Missing
-ExtensionClass/test/output/test_MultiMapping
-ExtensionClass/test/output/test_ThreadLock
-ExtensionClass/test/output/test_acquisition
-ExtensionClass/test/output/test_add
-ExtensionClass/test/output/test_binding
-ExtensionClass/test/output/test_explicit_acquisition
-ExtensionClass/test/output/test_method_hook
+Persistence/PersistentList.py
+Persistence/PersistentMapping.py
 Persistence/__init__.py
+Persistence/tests/__init__.py
+Persistence/tests/testPersistent.py
+Persistence/tests/test_ExtensionClass.py
 ThreadedAsync/LoopCallback.py
 ThreadedAsync/__init__.py
 Tools/README.txt
@@ -163,6 +124,7 @@
 Tools/checkbtrees.py
 Tools/fsdump.py
 Tools/fsrefs.py
+Tools/fsstats.py
 Tools/fstail.py
 Tools/fstest.py
 Tools/migrate.py
@@ -180,8 +142,6 @@
 Tools/tests/test-checker.fs
 Tools/tests/testfstest.py
 Tools/tests/testzeopack.py
-ZConfig/Config.py
-ZConfig/Context.py
 ZConfig/__init__.py
 ZConfig/cfgparser.py
 ZConfig/cmdline.py
@@ -194,7 +154,6 @@
 ZConfig/url.py
 ZConfig/doc/Makefile
 ZConfig/doc/README.txt
-ZConfig/doc/oldapi.tex
 ZConfig/doc/schema.dtd
 ZConfig/doc/xmlmarkup.perl
 ZConfig/doc/xmlmarkup.sty
@@ -204,12 +163,18 @@
 ZConfig/tests/__init__.py
 ZConfig/tests/runtests.py
 ZConfig/tests/support.py
+ZConfig/tests/test_cfgimports.py
 ZConfig/tests/test_cmdline.py
 ZConfig/tests/test_config.py
 ZConfig/tests/test_datatypes.py
 ZConfig/tests/test_loader.py
 ZConfig/tests/test_schema.py
 ZConfig/tests/test_subst.py
+ZConfig/tests/input/base-datatype1.xml
+ZConfig/tests/input/base-datatype2.xml
+ZConfig/tests/input/base-keytype1.xml
+ZConfig/tests/input/base-keytype2.xml
+ZConfig/tests/input/base.xml
 ZConfig/tests/input/include.conf
 ZConfig/tests/input/inner.conf
 ZConfig/tests/input/library.xml
@@ -218,7 +183,12 @@
 ZConfig/tests/input/simple.conf
 ZConfig/tests/input/simple.xml
 ZConfig/tests/input/simplesections.conf
+ZConfig/tests/input/simplesections.xml
+ZConfig/tests/library/__init__.py
+ZConfig/tests/library/thing/__init__.py
 ZConfig/tests/library/thing/component.xml
+ZConfig/tests/library/thing/extras/extras.xml
+ZConfig/tests/library/widget/__init__.py
 ZConfig/tests/library/widget/component.xml
 ZConfig/tests/library/widget/extra.xml
 ZEO/ClientCache.py
@@ -243,6 +213,8 @@
 ZEO/stats.py
 ZEO/util.py
 ZEO/version.txt
+ZEO/zeoctl.py
+ZEO/zeoctl.xml
 ZEO/zeopasswd.py
 ZEO/auth/__init__.py
 ZEO/auth/auth_digest.py
@@ -290,8 +262,6 @@
 ZODB/MappingStorage.py
 ZODB/Mount.py
 ZODB/POSException.py
-ZODB/PersistentList.py
-ZODB/PersistentMapping.py
 ZODB/TimeStamp.c
 ZODB/TmpStore.py
 ZODB/Transaction.py
@@ -299,8 +269,6 @@
 ZODB/ZApplication.py
 ZODB/__init__.py
 ZODB/bpthread.py
-ZODB/cPersistence.c
-ZODB/cPersistence.h
 ZODB/cPickleCache.c
 ZODB/component.xml
 ZODB/config.py
@@ -315,6 +283,7 @@
 ZODB/fstools.py
 ZODB/lock_file.py
 ZODB/referencesf.py
+ZODB/serialize.py
 ZODB/storage.xml
 ZODB/transact.py
 ZODB/utils.py
@@ -359,9 +328,19 @@
 ZopeUndo/__init__.py
 ZopeUndo/tests/__init__.py
 ZopeUndo/tests/testPrefix.py
-logging/__init__.py
-logging/config.py
-logging/handlers.py
+persistent/TimeStamp.c
+persistent/__init__.py
+persistent/cPersistence.c
+persistent/cPersistence.h
+persistent/cPickleCache.c
+persistent/list.py
+persistent/mapping.py
+persistent/ring.c
+persistent/ring.h
+persistent/pickle/pickle.c
+persistent/tests/__init__.py
+persistent/tests/testPersistent.py
+persistent/tests/test_pickle.py
 zLOG/BaseLogger.py
 zLOG/EventLogger.py
 zLOG/LogHandlers.py
@@ -374,6 +353,7 @@
 zLOG/tests/testzLogConfig.py
 zdaemon/Daemon.py
 zdaemon/__init__.py
+zdaemon/component.xml
 zdaemon/sample.conf
 zdaemon/schema.xml
 zdaemon/zdctl.py




More information about the Zodb-checkins mailing list