mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.6] compare with difflib not diff(1) (GH-5450) (GH-5453)

Browse source 
Co-authored-by: Benjamin Peterson <benjamin@python.org>
This commit is contained in:
Benjamin Peterson 2018-01-30 11:31:10 -08:00 • committed by GitHub
parent a23a2c555c
commit eb126eddbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/lib2to3/tests/test_parser.py
View file

@ -12,6 +12,7 @@ from .support import driver, driver_no_print_statement
from test.support import verbose from test.support import verbose
# Python imports # Python imports
import difflib
import importlib import importlib
import operator import operator
import os import os
@ -429,8 +430,8 @@ class TestParserIdempotency(support.TestCase):
except ParseError as err: except ParseError as err:
self.fail('ParseError on file %s (%s)' % (filepath, err)) self.fail('ParseError on file %s (%s)' % (filepath, err))
new = str(tree) new = str(tree)
x = diff(filepath, new, encoding=encoding) if new != source:
if x: print(diff_texts(source, new, filepath))
self.fail("Idempotency failed: %s" % filepath) self.fail("Idempotency failed: %s" % filepath)
def test_extended_unpacking(self): def test_extended_unpacking(self):
@ -473,14 +474,9 @@ class TestLiterals(GrammarTest):
self.validate(s) self.validate(s)
def diff(fn, result, encoding='utf-8'): def diff_texts(a, b, filename):
try: a = a.splitlines()
with open('@', 'w', encoding=encoding, newline='\n') as f: b = b.splitlines()
f.write(str(result)) return difflib.unified_diff(a, b, filename, filename,
fn = fn.replace('"', '\\"') "(original)", "(reserialized)",
return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None)) lineterm="")
finally:
try:
os.remove("@")
except OSError:
pass