Commit 6c8698dd authored by Martijn Pieters's avatar Martijn Pieters

Remove more tabs (python -tt is your friend).

parent 5ee45a6d
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
############################################################################## ##############################################################################
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.156 2002/08/01 16:00:39 mj Exp $""" $Id: ObjectManager.py,v 1.157 2002/08/14 19:59:18 mj Exp $"""
__version__='$Revision: 1.156 $'[11:-2] __version__='$Revision: 1.157 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, re, Products import os, App.FactoryDispatcher, re, Products
...@@ -412,10 +412,10 @@ class ObjectManager( ...@@ -412,10 +412,10 @@ class ObjectManager(
except: pass except: pass
if hasattr(obj,'aq_parent'): if hasattr(obj,'aq_parent'):
obj=obj.aq_parent obj=obj.aq_parent
relativePhysicalPath = ('..',) + relativePhysicalPath relativePhysicalPath = ('..',) + relativePhysicalPath
else: else:
return vals return vals
x=x+1 x=x+1
return vals return vals
......
...@@ -56,14 +56,14 @@ class TestRunner: ...@@ -56,14 +56,14 @@ class TestRunner:
module = None module = None
try: try:
sys.path.append(path) # let module find things in its dir sys.path.append(path) # let module find things in its dir
try: try:
module=imp.load_module(name, file, pathname, desc) module=imp.load_module(name, file, pathname, desc)
except: except:
(tb_t, tb_v, tb_tb) = sys.exc_info() (tb_t, tb_v, tb_tb) = sys.exc_info()
self.report("Module %s failed to load\n%s: %s" % (pathname, self.report("Module %s failed to load\n%s: %s" % (pathname,
tb_t, tb_v)) tb_t, tb_v))
self.report(string.join(traceback.format_tb(tb_tb)) + '\n') self.report(string.join(traceback.format_tb(tb_tb)) + '\n')
del tb_tb del tb_tb
finally: finally:
file.close() file.close()
sys.path.pop() # Remove module level path sys.path.pop() # Remove module level path
......
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