processQueue(): We can pretty much guarantee that if an os.error is

raised from the os.stat() call, the value will unpack into a
two-tuple.  So just do the unpacking in place, check the code and use
Utils.reraise() if it wasn't what we expected.

1 files changed, 2 insertions, 7 deletions

diff --git a/Mailman/OutgoingQueue.py b/Mailman/OutgoingQueue.py
index 776deffcf..5ab7b8358 100644
--- a/Mailman/OutgoingQueue.py
+++ b/Mailman/OutgoingQueue.py
@@ -99,17 +99,12 @@ def processQueue():
         #
         try:
             st = os.stat(full_fname)
-        except os.error, rest:
-            try:
-                code, msg = rest
-            except ValueError:
-                code = ""
-                msg = str(rest)
+        except os.error, (code, msg):
             if code == errno.ENOENT:
                 # file does not exist, it's already been dequeued
                 continue
             else:
-                raise os.error, rest
+                Utils.reraise()
         #
         # if the file is not a deferred queue message, we check to see if the
         # creation time was too long ago and process it anyway.  If the