From patchwork Mon Nov 14 23:35:58 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [6,of,6] convert: migrate to util.iterfile
From: Jun Wu <quark@fb.com>
X-Patchwork-Id: 17574
Message-Id: <e6c69631dab2ae0eeb7e.1479166558@x1c>
To: <mercurial-devel@mercurial-scm.org>
Date: Mon, 14 Nov 2016 23:35:58 +0000

# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 1479165435 0
#      Mon Nov 14 23:17:15 2016 +0000
# Node ID e6c69631dab2ae0eeb7ea910fd0ee6445472a42b
# Parent  23ebc9cb6d773d549b6822da154da3c0125b90c5
# Available At https://bitbucket.org/quark-zju/hg-draft
#              hg pull https://bitbucket.org/quark-zju/hg-draft -r e6c69631dab2
convert: migrate to util.iterfile

diff --git a/hgext/convert/common.py b/hgext/convert/common.py
--- a/hgext/convert/common.py
+++ b/hgext/convert/common.py
@@ -455,5 +455,5 @@ class mapfile(dict):
                 raise
             return
-        for i, line in enumerate(fp):
+        for i, line in enumerate(util.iterfile(fp)):
             line = line.splitlines()[0].rstrip()
             if not line:
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -202,5 +202,5 @@ class converter(object):
         try:
             fp = open(path, 'r')
-            for i, line in enumerate(fp):
+            for i, line in enumerate(util.iterfile(fp)):
                 line = line.splitlines()[0].rstrip()
                 if not line: