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 2c3495c37d4370cefb46478ce66b701beac79715..604fbf29d201b0aeb83d1bff6677f0ae477ef694 100644 (file)
--- 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 490b111f7cfb97c272a91ceb4da449367bbaaafd..51cd04fcfcd1e8a9f7e2e24449a7ed98d05ab511 100644 (file)
--- 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 c8ec3fc23c9057166c7b312f41ab7e8fa26e3f3a..9f4fe2f4f021f0bfa66267b05c6bad45608a98d7 100644 (file)
--- 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 c32a15cb009839633da734636b8f6151459a3543..d8277f2755482376223cd20b901a5d2664f26e41 100644 (file)
--- 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 a4910ec7057ac61e3340fde06b53936e17693549..877430e96e9835566602fc7c69d59f76d3bd4fd6 100644 (file)
--- 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