From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Date: Thu, 5 Aug 2010 14:51:34 +0000 (+0200)
Subject: EOFError can still be raised by array.fromfile() in Python >=2.6.6 and >=2.7.1.
X-Git-Tag: v2.2_rc68~400
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dee1323cd34ed867b16f898f1ea7732af6d235da;p=portage.git

EOFError can still be raised by array.fromfile() in Python >=2.6.6 and >=2.7.1.
---

diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 2c3495c37..604fbf29d 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -71,7 +71,6 @@ class PipeReader(AbstractPollTask):
 			buf = array.array('B')
 			try:
 				buf.fromfile(f, self._bufsize)
-			# EOFError was raised in Python <2.6.6 and <2.7.1.
 			except (EOFError, IOError):
 				pass
 
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index 490b111f7..51cd04fcf 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -148,7 +148,6 @@ class SpawnProcess(SubProcess):
 			buf = array.array('B')
 			try:
 				buf.fromfile(files.process, self._bufsize)
-			# EOFError was raised in Python <2.6.6 and <2.7.1.
 			except (EOFError, IOError):
 				pass
 
@@ -210,7 +209,6 @@ class SpawnProcess(SubProcess):
 			buf = array.array('B')
 			try:
 				buf.fromfile(self._files.process, self._bufsize)
-			# EOFError was raised in Python <2.6.6 and <2.7.1.
 			except (EOFError, IOError):
 				pass
 
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index c8ec3fc23..9f4fe2f4f 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1268,7 +1268,6 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero
 				buf = array.array('B')
 				try:
 					buf.fromfile(f, buffsize)
-				# EOFError was raised in Python <2.6.6 and <2.7.1.
 				except (EOFError, IOError):
 					pass
 				if not buf:
diff --git a/pym/portage/tests/ebuild/test_array_fromfile_eof.py b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
index c32a15cb0..d8277f275 100644
--- a/pym/portage/tests/ebuild/test_array_fromfile_eof.py
+++ b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
@@ -28,7 +28,6 @@ class ArrayFromfileEofTestCase(TestCase):
 			a = array.array('B')
 			try:
 				a.fromfile(f, len(input_bytes) + 1)
-			# EOFError was raised in Python <2.6.6 and <2.7.1.
 			except (EOFError, IOError):
 				# python-3.0 lost data here
 				eof = True
diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index a4910ec70..877430e96 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -95,7 +95,6 @@ def _test_pty_eof():
 		buf = array.array('B')
 		try:
 			buf.fromfile(master_file, 1024)
-		# EOFError was raised in Python <2.6.6 and <2.7.1.
 		except (EOFError, IOError):
 			eof = True