python-postgres
diff --git a/‎postgresql/copyman.py‎
Lines changed: 16 additions & 18 deletions b/‎postgresql/copyman.py‎
Lines changed: 16 additions & 18 deletions
diff --git a/‎postgresql/test/test_copyman.py‎
Lines changed: 2 additions & 2 deletions b/‎postgresql/test/test_copyman.py‎
Lines changed: 2 additions & 2 deletions
@@ -16,8 +16,8 @@
 from .protocol.element3 import CopyData, CopyDone, Complete, cat_messages
 from .protocol.xact3 import Complete as xactComplete
 
-#: 100KB buffer for COPY messages by default.
-default_buffer_size = 1024 * 100
+#: 10KB buffer for COPY messages by default.
+default_buffer_size = 1024 * 10
 
 class Fault(Exception):
 	"""
@@ -33,28 +33,26 @@ def __init__(self, manager, faults):
 		self.faults = faults
 
 	def __str__(self):
-		return "{0} faults occurred".format(len(self.receivers))
+		return "{0} faults occurred".format(len(self.faults))
 
 class CopyFail(Exception):
 	"""
-	Exception thrown by the CopyManager when the COPY failed.
+	Exception thrown by the CopyManager when the COPY operation failed.
+
+	The 'manager' attribute the CopyManager that raised the CopyFail.
+
+	The 'reason' attribute is a string indicating why it failed.
+
+	The 'faults' attribute is a mapping of receivers to exceptions that were
+	raised on exit.
 	"""
-	def __init__(self, manager, reason, faults = None):
+	def __init__(self, manager, reason = None, faults = None):
 		self.manager = manager
 		self.reason = reason
 		self.faults = faults or {}
 
 	def __str__(self):
-		return self.reason
-
-class NoReceivers(CopyFail):
-	"""
-	Exception thrown by the CopyManager when the COPY failed due to all the
-	receivers faulting out.
-	"""
-	reason = 'no receivers remained after fault'
-	def __init__(self, manager):
-		self.manager = manager
+		return self.reason or 'copy '
 
 # The identifier for PQv3 copy data.
 PROTOCOL_PQv3 = "PQv3"
@@ -708,9 +706,9 @@ def __exit__(self, typ, val, tb):
 
 		# No receivers? It wasn't a success.
 		if not self.receivers:
-			if typ is NoReceivers:
+			if typ is CopyFail:
 				raise
-			raise NoReceivers(self)
+			raise CopyFail(self, "no receivers")
 
 		exit_faults = {}
 		for x in self.receivers:
@@ -743,7 +741,7 @@ def _service_producer(self):
 		# Setup current data.
 		if not self.receivers:
 			# No receivers to take the data.
-			raise NoReceivers(self)
+			raise CopyFail(self, "no receivers")
 
 		try:
 			nextdata = next(self.producer)
 
@@ -399,9 +399,9 @@ def testNoReceivers(self):
 					except copyman.Fault as cf:
 						self.failUnless(sr1 in cf.faults)
 						# Don't reconcile.
-		except copyman.NoReceivers:
+		except copyman.CopyFail:
+			self.failUnless(not bool(copy.receivers))
 			# Success.
-			pass
 		else:
 			self.fail("did not raise expected error")
 		# Let the exception cause a failure.