udiffer.py: Extract function to resolve code duplication

diff --git a/expat/tests/udiffer.py b/expat/tests/udiffer.py
index ef6a7307e80a11fee1a2c064f8448e9cb78dc5ce..4f7f759958116521c7a0b18a4cdacfa00ad08b1c 100755 (executable)
--- a/expat/tests/udiffer.py
+++ b/expat/tests/udiffer.py
@@ -31,21 +31,21 @@
 import sys
 import difflib
 
+
+def _read_lines(filename):
+    try:
+        with open(filename) as f:
+            return f.readlines()
+    except UnicodeDecodeError:
+        with open(filename, encoding='utf_16') as f:
+            return f.readlines()
+
+
 if len(sys.argv) != 3:
     sys.exit(2)
 
-try:
-    with open(sys.argv[1]) as infile1:
-        first = infile1.readlines()
-except UnicodeDecodeError:
-    with open(sys.argv[1], encoding="utf_16") as infile1:
-        first = infile1.readlines()
-try:
-    with open(sys.argv[2]) as infile2:
-        second = infile2.readlines()
-except UnicodeDecodeError:
-    with open(sys.argv[2], encoding="utf_16") as infile2:
-        second = infile2.readlines()
+first = _read_lines(sys.argv[1])
+second = _read_lines(sys.argv[2])
 
 diffs = list(difflib.unified_diff(first, second,
                                   fromfile=sys.argv[1], tofile=sys.argv[2]))