From 528ba5d1699a464a19d3aa3575c772198e79e08f Mon Sep 17 00:00:00 2001 From: bwarsaw Date: Thu, 10 Dec 1998 16:43:36 +0000 Subject: move the import of Mailman.Utils.reraise into the debugging-open() definition -- the only place it's used. Also, comment out the whole def and __builtin__ hack. This debugging stuff probably shouldn't go into the release (although its use should be documented). --- scripts/driver | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/driver b/scripts/driver index d7c9222da..5ba617b47 100644 --- a/scripts/driver +++ b/scripts/driver @@ -19,7 +19,6 @@ # This better succeed. If this fails, Python is royally screwed so we might # as well let the Web server give us a fatal and obtrusive error. import sys -from Mailman.Utils import reraise # From here on we are as bulletproof as possible! @@ -30,19 +29,20 @@ from Mailman.Utils import reraise # unnecessary in Python 1.5.2, which also does sensible things to most os # module functions. -realopen = open -def open(filename, mode='r', bufsize=-1, realopen=realopen): - try: - return realopen(filename, mode, bufsize) - except IOError, e: - strerror = e.strerror + ': ' + filename - e.strerror = strerror - e.filename = filename - e.args = (e.args[0], strerror) - reraise(e) - -import __builtin__ -__builtin__.__dict__['open'] = open +##realopen = open +##def open(filename, mode='r', bufsize=-1, realopen=realopen): +## from Mailman.Utils import reraise +## try: +## return realopen(filename, mode, bufsize) +## except IOError, e: +## strerror = e.strerror + ': ' + filename +## e.strerror = strerror +## e.filename = filename +## e.args = (e.args[0], strerror) +## reraise(e) + +##import __builtin__ +##__builtin__.__dict__['open'] = open -- cgit v1.3.1