Commit 8a7e71b1 authored by Stefan H. Holek's avatar Stefan H. Holek

Catch up with standalone ZTC.

parent d93d4977
Zope 2.8 edition 0.9.9 (Zope 2.8 edition)
- Don't break if Python distros ship without profile support (Debian, Ubuntu). - Don't break if Python distros ship without profile support (Debian, Ubuntu).
- Functional.publish() would hang if it got a request_method argument other - Functional.publish() would hang if it got a request_method argument other
than GET or HEAD while omitting the stdin argument. than GET or HEAD while omitting the stdin argument.
...@@ -6,11 +6,11 @@ Zope 2.8 edition ...@@ -6,11 +6,11 @@ Zope 2.8 edition
patches. patches.
- Made functional doctests set cookie related headers. - Made functional doctests set cookie related headers.
- Made functional doctests set the Www-Authenticate header. - Made functional doctests set the Www-Authenticate header.
- Made sure logging is configured. Read $INSTANCE_HOME/log.ini if it exists. - Made sure logging is configured.
- Made base.TestCase a new-style class. - Made base.TestCase a new-style class.
- Added placeless.py for Z3-style setup. Thanks to Whit Morriss. - Added placeless.py for Z3-style setup. Thanks to Whit Morriss.
- Fixed functional.http to only pass the request body (no headers) to - Fixed functional.http() to only pass the request body (no headers) to
publish_module. Thanks to Andreas Zeidler. publish_module(). Thanks to Andreas Zeidler.
0.9.8 (Zope 2.8 edition) 0.9.8 (Zope 2.8 edition)
- Renamed 'doctest' package to 'zopedoctest' because of name-shadowing - Renamed 'doctest' package to 'zopedoctest' because of name-shadowing
......
...@@ -62,13 +62,11 @@ class Configurator: ...@@ -62,13 +62,11 @@ class Configurator:
return return
if self.zeo_instance_home: if self.zeo_instance_home:
self.setup_zeo_instance_home() self.setup_zeo_instance_home()
self.setup_logging()
else: else:
if self.instance_home: if self.instance_home:
self.setup_instance_home() self.setup_instance_home()
else: else:
self.detect_and_setup_instance_home() self.detect_and_setup_instance_home()
self.setup_logging()
self.setup_custom_zodb() self.setup_custom_zodb()
def setup_zeo_instance_home(self): def setup_zeo_instance_home(self):
...@@ -130,13 +128,6 @@ class Configurator: ...@@ -130,13 +128,6 @@ class Configurator:
os.environ['INSTANCE_HOME'] = INSTANCE_HOME = self.cwd os.environ['INSTANCE_HOME'] = INSTANCE_HOME = self.cwd
self.setconfig(instancehome=self.cwd) self.setconfig(instancehome=self.cwd)
def setup_logging(self):
'''If $INSTANCE_HOME/log.ini exists, load it.'''
logini = os.path.join(self.getconfig('instancehome'), 'log.ini')
if os.path.exists(logini):
import logging.config
logging.config.fileConfig(logini)
def add_instance(self, p): def add_instance(self, p):
'''Adds an INSTANCE_HOME directory to Products.__path__ and sys.path.''' '''Adds an INSTANCE_HOME directory to Products.__path__ and sys.path.'''
import Products import Products
......
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