Commit a0bee105 authored by Tim Peters's avatar Tim Peters

Move to ZODB 3.6.0b1.

ZopeDatabase.createDB():  Plug database_name into config rather than
passing it to ZODBDatabase.open().  More should be done to detect
conflicting <zodb_db> section name and database_name, but I'm not
sure where all the relevant code is.

There are a number of DeprecationWarnings about subtransactions when
running the tests.  Should be repaired.

One test failure, but doesn't look like it's related to ZODB:

File "C:\Code\Zope\lib\python\Products\Five\tests\forms.txt", line 35, in forms.txt
Failed example:
    print http(r"""
    GET /test_folder_1_/ftf/+/protectedaddform.html HTTP/1.1
    Authorization: Basic viewer:secret
    """, handle_errors=False)
Exception raised:
    Traceback (most recent call last):
      File "C:\Code\Zope\lib\python\zope\testing\doctest.py", line 1315, in __run
        compileflags, 1) in test.globs
      File "<doctest forms.txt[4]>", line 1, in ?
        print http(r"""
      File "C:\Code\Zope\lib\python\Testing\ZopeTestCase\zopedoctest\functional.py", line 181, in http
        debug=not handle_errors,
      File "C:\Code\Zope\lib\python\ZPublisher\Test.py", line 193, in publish_module
        response = publish(request, module_name, after_list, debug=debug)
      File "C:\Code\Zope\lib\python\ZPublisher\Publish.py", line 144, in publish
        sys.exc_info()[2],
      File "C:\Code\Zope\lib\python\Zope2\App\startup.py", line 199, in zpublisher_exception_hook
        f(client, REQUEST, t, v, traceback, error_log_url=error_log_url)
      File "C:\Code\Zope\lib\python\ZPublisher\Publish.py", line 104, in publish
        object=request.traverse(path, validated_hook=validated_hook)
      File "C:\Code\Zope\lib\python\ZPublisher\BaseRequest.py", line 461, in traverse
        response.unauthorized()
      File "C:\Code\Zope\lib\python\ZPublisher\HTTPResponse.py", line 682, in unauthorized
        raise Unauthorized, m
    Unauthorized: <html>
      <head><title></title></head>
      <body bgcolor="#FFFFFF">

     <strong>You are not authorized to access this resource.</strong>

      </body>
    </html>
parent b795bc99
......@@ -156,7 +156,8 @@ class ZopeDatabase(ZODBDatabase):
attributes for use by DBTab """
def createDB(self, database_name, databases):
return ZODBDatabase.open(self, database_name, databases)
self.config.database_name = database_name
return ZODBDatabase.open(self, databases)
def open(self, database_name, databases):
DB = self.createDB(database_name, databases)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment