update

Author: jaredmauch

bin/show_qfiles

@@ -36,6 +36,7 @@ from __future__ import print_function
 import sys
 import argparse
 from pickle import load
+import pickle
 
 import paths
 from Mailman.i18n import C_
@@ -63,16 +64,28 @@ def main():
     for filename in args.qfiles:
         if not args.quiet:
             print(('====================>', filename))
-        fp = open(filename)
         if filename.endswith(".pck"):
-            msg = load(fp)
-            data = load(fp)
-            if data.get('_parsemsg'):
-                sys.stdout.write(msg)
-            else:
-                sys.stdout.write(msg.as_string())
+            try:
+                with open(filename, 'rb') as fp:
+                    try:
+                        # Try UTF-8 first for newer files
+                        msg = load(fp, fix_imports=True, encoding='utf-8')
+                        data = load(fp, fix_imports=True, encoding='utf-8')
+                    except (UnicodeDecodeError, pickle.UnpicklingError):
+                        # Fall back to latin1 for older files
+                        fp.seek(0)
+                        msg = load(fp, fix_imports=True, encoding='latin1')
+                        data = load(fp, fix_imports=True, encoding='latin1')
+                    if data.get('_parsemsg'):
+                        sys.stdout.write(msg)
+                    else:
+                        sys.stdout.write(msg.as_string())
+            except Exception as e:
+                print('Error reading pickle file %s: %s' % (filename, str(e)), file=sys.stderr)
+                sys.exit(1)
         else:
-            sys.stdout.write(fp.read())
+            with open(filename) as fp:
+                sys.stdout.write(fp.read())
 
 
 if __name__ == '__main__':