[qmtest] Problem loading expectation

[Nathaniel Smith]

On Mon, Jul 14, 2003 at 05:12:00PM -0700, Nathaniel Smith wrote:
[the attachment-eating spiders strike again]

-- Nathaniel

-- 
"But in Middle-earth, the distinct accusative case disappeared from
the speech of the Noldor (such things happen when you are busy
fighting Orcs, Balrogs, and Dragons)."
-------------- next part --------------
diff -urN --exclude='*~' --exclude='.*' --exclude=CVS --exclude='*.pyo' --exclude='*.pyc' --exclude=build --exclude=GNUmakefile --exclude=config.log --exclude=config.status --exclude=setup_path.py --exclude=qm.sh --exclude=qm.spec qm-clean/ChangeLog qm-pickle-reading/ChangeLog
--- qm-clean/ChangeLog	2003-07-09 17:33:44.000000000 -0700
+++ qm-pickle-reading/ChangeLog	2003-07-14 17:05:24.000000000 -0700
@@ -1,3 +1,12 @@
+2003-07-14  Nathaniel Smith  <njs at codesourcery.com>
+
+	* qm/test/classes/pickle_result_stream.py
+	(PickleResultReader.GetResult): Don't catch UnpicklingError;
+	it's not necessary with Python 2.2.
+	(PickleResultReader.__init__): Likewise.
+	Also, fix typo (call self._ResetUnpickler, not
+	self._ResetPickler).
+	
 2003-07-09  Nathaniel Smith  <njs at codesourcery.com>
 
 	* qm/test/context.py (Context.items): New method.
diff -urN --exclude='*~' --exclude='.*' --exclude=CVS --exclude='*.pyo' --exclude='*.pyc' --exclude=build --exclude=GNUmakefile --exclude=config.log --exclude=config.status --exclude=setup_path.py --exclude=qm.sh --exclude=qm.spec qm-clean/qm/test/classes/pickle_result_stream.py qm-pickle-reading/qm/test/classes/pickle_result_stream.py
--- qm-clean/qm/test/classes/pickle_result_stream.py	2003-07-03 12:28:22.000000000 -0700
+++ qm-pickle-reading/qm/test/classes/pickle_result_stream.py	2003-07-14 17:04:14.000000000 -0700
@@ -181,7 +181,7 @@
         # Check for a version number
         try:
             version = self.__unpickler.load()
-        except (EOFError, cPickle.UnpicklingError):
+        except EOFError:
             # This file is empty, no more handling needed.
             return
         
@@ -190,7 +190,7 @@
             # holding a 'Result'.  So we have no metadata to load and
             # should just rewind.
             self.file.seek(0)
-            self._ResetPickler()
+            self._ResetUnpickler()
         elif version == 1:
             self._ReadMetadata()
         else:
@@ -251,9 +251,6 @@
                 thing = self.__unpickler.load()
             except EOFError:
                 return None
-            except cPickle.UnpicklingError:
-                # This is raised at EOF if file is a StringIO.
-                return None
             else:
                 if thing is _annotation_sentinel:
                     # We're looking for results, but this is an annotation,