floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename internal function as suggested during review

This commit is contained in:
Bruno Oliveira 2018-05-04 11:08:35 -03:00 committed by GitHub
parent dca77b2273
commit 413b1aa4e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_pytest/assertion/util.py
View File

@ -172,9 +172,9 @@ def _diff_text(left, right, verbose=False):
from difflib import ndiff from difflib import ndiff
explanation = [] explanation = []
def to_unicode_text(binary_text): def escape_for_readable_diff(binary_text):
""" """
This ensures that the internal string is always valid unicode, converting any bytes safely to valid unicode. Ensures that the internal string is always valid unicode, converting any bytes safely to valid unicode.
This is done using repr() which then needs post-processing to fix the encompassing quotes and un-escape This is done using repr() which then needs post-processing to fix the encompassing quotes and un-escape
newlines and carriage returns (#429). newlines and carriage returns (#429).
""" """
@ -184,9 +184,9 @@ def _diff_text(left, right, verbose=False):
return r return r
if isinstance(left, six.binary_type): if isinstance(left, six.binary_type):
left = to_unicode_text(left) left = escape_for_readable_diff(left)
if isinstance(right, six.binary_type): if isinstance(right, six.binary_type):
right = to_unicode_text(right) right = escape_for_readable_diff(right)
if not verbose: if not verbose:
i = 0 # just in case left or right has zero length i = 0 # just in case left or right has zero length
for i in range(min(len(left), len(right))): for i in range(min(len(left), len(right))):