From 25674a95f8609d0fd0e7974ea5af8ee7829002eb Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 19 Jul 2012 01:10:59 -0400 Subject: [PATCH] RF: filter.py -- single readline in a loop --- server/filter.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/filter.py b/server/filter.py index 5f1f01cb..a9bc35f3 100644 --- a/server/filter.py +++ b/server/filter.py @@ -455,14 +455,12 @@ class FileFilter(Filter): logSys.exception(e) return False - line = container.readline() - while not line == "": - if not self._isActive(): - # The jail has been stopped + while True: + line = container.readline() + if (line == "") or not self._isActive(): + # The jail reached the bottom or has been stopped break self.processLineAndAdd(line) - # Read a new line. - line = container.readline() container.close() return True