Commit f25c33ca authored by Stefan H. Holek's avatar Stefan H. Holek

Catch up with standalone ZTC.

parent 603b610c
......@@ -7,11 +7,11 @@
patches.
- Made functional doctests set cookie related headers.
- 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.
- Added placeless.py for Z3-style setup. Thanks to Whit Morriss.
- Fixed functional.http to only pass the request body (no headers) to
publish_module. Thanks to Andreas Zeidler.
- Fixed functional.http() to only pass the request body (no headers) to
publish_module(). Thanks to Andreas Zeidler.
0.9.8 (Zope 2.8 edition)
- Renamed 'doctest' package to 'zopedoctest' because of name-shadowing
......
......@@ -62,13 +62,11 @@ class Configurator:
return
if self.zeo_instance_home:
self.setup_zeo_instance_home()
self.setup_logging()
else:
if self.instance_home:
self.setup_instance_home()
else:
self.detect_and_setup_instance_home()
self.setup_logging()
self.setup_custom_zodb()
def setup_zeo_instance_home(self):
......@@ -130,13 +128,6 @@ class Configurator:
os.environ['INSTANCE_HOME'] = INSTANCE_HOME = 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):
'''Adds an INSTANCE_HOME directory to Products.__path__ and sys.path.'''
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