[Zope-Checkins] CVS: Zope3/lib/python/Zope/Configuration - name.py:1.2.16.1 xmlconfig.py:1.8.8.1
Jim Fulton
jim@zope.com
Thu, 24 Oct 2002 11:02:03 -0400
Update of /cvs-repository/Zope3/lib/python/Zope/Configuration
In directory cvs.zope.org:/tmp/cvs-serv24845/lib/python/Zope/Configuration
Modified Files:
Tag: FileSystemSync-branch
name.py xmlconfig.py
Log Message:
Got debugging working in the new Application access objects.
=== Zope3/lib/python/Zope/Configuration/name.py 1.2 => 1.2.16.1 ===
--- Zope3/lib/python/Zope/Configuration/name.py:1.2 Mon Jun 10 19:29:24 2002
+++ Zope3/lib/python/Zope/Configuration/name.py Thu Oct 24 11:02:01 2002
@@ -18,6 +18,7 @@
import os
import sys
+from os.path import abspath
from types import ModuleType
def resolve(name, package='ZopeProducts', _silly=('__doc__',), _globals={}):
@@ -80,7 +81,8 @@
return file
raise
- path = os.path.split(package.__file__)[0]
+ path = abspath(os.path.split(package.__file__)[0])
+
if file:
path = os.path.join(path, file)
return path
=== Zope3/lib/python/Zope/Configuration/xmlconfig.py 1.8 => 1.8.8.1 ===
--- Zope3/lib/python/Zope/Configuration/xmlconfig.py:1.8 Thu Sep 5 16:25:09 2002
+++ Zope3/lib/python/Zope/Configuration/xmlconfig.py Thu Oct 24 11:02:01 2002
@@ -18,6 +18,7 @@
import os
import name
+from os.path import abspath
from xml.sax import make_parser
from xml.sax.xmlreader import InputSource
from xml.sax.handler import ContentHandler, feature_namespaces
@@ -261,7 +262,7 @@
def __init__(self, file_name, module=_NO_MODULE_GIVEN):
if module is not None and module is not _NO_MODULE_GIVEN:
- module_dir = os.path.split(module.__file__)[0]
+ module_dir = abspath(os.path.split(module.__file__)[0])
file_name = os.path.join(module_dir, file_name)