current_step needs to be zero when starting a new command.

James William Pye · James William Pye · commit 14e41aab8026 · 2009-02-02T13:09:18.000-07:00
diff --git a/postgresql/protocol/client3.py b/postgresql/protocol/client3.py
@@ -481,20 +481,25 @@ def standard_put(self, messages):
 							if self.commands[offset] is element.SynchronizeMessage:
 								break
 						else:
+							##
+							# It's done.
 							self.state = Complete
 							return count
+					##
 					# Not quite done, the state(Ready) message still
 					# needs to be received.
 					cmd = self.commands[offset]
 					paths = self.hook[cmd.type]
+					# On a new command, setup the new step.
+					current_step = 0
 					continue
 				elif x[0] in self.asynchook:
 					asyncs.append(self.asynchook[x[0]](x[1]))
 				else:
 					##
 					# Procotol violation
 					err = pg_exc.ProtocolError(
-						"expected message of types %r, "\
+						"expected message of types %r, " \
 						"but received %r instead" % (
 							tuple(paths[current_step].keys()), x[0]
 						),
diff --git a/postgresql/test/testall.py b/postgresql/test/testall.py
@@ -8,6 +8,7 @@
 
 from postgresql.test.test_iri import *
 from postgresql.test.test_protocol import *
+from postgresql.test.test_exceptions import *
 
 if __name__ == '__main__':
 	from types import ModuleType
