From: Zack Cerza <zack@redhat.com>
Date: Tue, 19 Jul 2016 23:56:58 +0000 (-0600)
Subject: Drop use of xreadlines()
X-Git-Tag: 1.1.0~560^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=21f874b5d37803260184929ac481e9ce93e718f1;p=teuthology.git

Drop use of xreadlines()

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index 74d68936de..c5b1c77fb2 100644
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -246,9 +246,7 @@ def copy_to_log(f, logger, loglevel=logging.INFO):
     if isinstance(f, ChannelFile):
         f._flags += ChannelFile.FLAG_BINARY
 
-    # i can't seem to get fudge to fake an iterable, so using this old
-    # api for now
-    for line in f.xreadlines():
+    for line in f.readlines():
         line = line.rstrip()
         # Second part of work-around for http://tracker.ceph.com/issues/8313
         try: