Removed commented-out debug code and additional debug printings. Verified it works on py2.4, 2.5 and 2.6

Byron · Byron · commit e14e3f143e72 · 2010-06-11T16:42:09.000+02:00
diff --git a/lib/git/async/pool.py b/lib/git/async/pool.py
@@ -95,10 +95,6 @@ def read(self, count=0, block=True, timeout=None):
 		# provided enough - its better to have some possibly empty task runs 
 		# than having and empty queue that blocks.
 		
-		# NOTE: TODO: that case is only possible if one Task could be connected 
-		# to multiple input channels in a manner known by the system. Currently
-		# this is not possible, but should be implemented at some point.
-		
 		# if the user tries to use us to read from a done task, we will never 
 		# compute as all produced items are already in the channel
 		task = self._task_ref()
@@ -260,8 +256,6 @@ def _prepare_channel_read(self, task, count):
 			# the following loops are kind of unrolled - code duplication
 			# should make things execute faster. Putting the if statements 
 			# into the loop would be less code, but ... slower
-			# DEBUG
-			# print actual_count, numchunks, chunksize, remainder, task._out_writer.size()
 			if self._num_workers:
 				# respect the chunk size, and split the task up if we want 
 				# to process too much. This can be defined per task
diff --git a/lib/git/async/task.py b/lib/git/async/task.py
@@ -88,11 +88,7 @@ def process(self, count=0):
 		self._num_writers += 1
 		self._wlock.release()
 		
-		#print "%r: reading %i" % (self.id, count)
-		#if hasattr(self, 'reader'):
-		#	print "from", self.reader().channel
 		items = self._read(count)
-		#print "%r: done reading %i items" % (self.id, len(items))
 		
 		try:
 			try:
@@ -117,7 +113,6 @@ def process(self, count=0):
 				self._wlock.release()
 			# END handle writer count
 		except Exception, e:
-			print >> sys.stderr, "task %s error:" % self.id, type(e), str(e)	# TODO: REMOVE DEBUG, or make it use logging
 			# be sure our task is not scheduled again
 			self.set_done()
 			
@@ -164,7 +159,6 @@ def process(self, count=0):
 			self._wlock.acquire()
 			try:
 				if self._num_writers == 0:
-					# print "Closing channel of %r" % self.id, len(self._out_writer.channel.queue), self._out_writer.channel
 					self.close()
 				# END handle writers
 			finally:
diff --git a/lib/git/async/util.py b/lib/git/async/util.py
@@ -2,7 +2,6 @@
 
 from threading import (
 	Lock,
-	current_thread,
 	_allocate_lock,
 	_Condition, 
 	_sleep,
diff --git a/test/git/async/test_pool.py b/test/git/async/test_pool.py
@@ -19,7 +19,6 @@ class TestThreadPool(TestBase):
 	
 	def _assert_single_task(self, p, async=False):
 		"""Performs testing in a synchronized environment"""
-		# return	# DEBUG TODO: Fixme deactivated it
 		print >> sys.stderr, "Threadpool: Starting single task (async = %i) with %i threads" % (async, p.size())
 		null_tasks = p.num_tasks()		# in case we had some before
 		
