sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.client.package] FileContent*Reader: keep raising StopIteration() at the end

Browse Source
This commit is contained in:
Fabio Erculiani
2012-08-10 17:51:22 +02:00
parent 08a4343597
commit 8ac22f4beb
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/entropy/client/interfaces/package.py
View File

@@ -44,6 +44,7 @@ class Package:
self._enc = enc
self._cpath = path
self._f = None
self._eof = False
def _open_f(self):
if isinstance(self._cpath, int):
@@ -63,12 +64,17 @@ class Package:
self.close()
def next(self):
if self._eof:
raise StopIteration()
if self._f is None:
self._open_f()
line = self._f.readline()
if not line:
self.close()
self._eof = True
raise StopIteration()
_package_id, _ftype, _path = line[:-1].split("|", 2)
# must be legal or die!
_package_id = int(_package_id)
@@ -183,6 +189,7 @@ class Package:
self._enc = enc
self._cpath = path
self._f = None
self._eof = False
def _open_f(self):
if isinstance(self._cpath, int):
@@ -202,12 +209,17 @@ class Package:
self.close()
def next(self):
if self._eof:
raise StopIteration()
if self._f is None:
self._open_f()
line = self._f.readline()
if not line:
self.close()
self._eof = True
raise StopIteration()
_mtime, _sha256, _path = line[:-1].split("|", 2)
# must be legal or die!
_mtime = float(_mtime)