Merge remote-tracking branch 'upstream/master' into features

1 files changed, 2 insertions, 2 deletions

diff --git a/_pytest/compat.py b/_pytest/compat.py
index 0554efeb7..723283d6a 100644
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -129,7 +129,7 @@ if _PY3:
     STRING_TYPES = bytes, str
     UNICODE_TYPES = str,
 
-    def _escape_strings(val):
+    def _ascii_escaped(val):
         """If val is pure ascii, returns it as a str().  Otherwise, escapes
         bytes objects into a sequence of escaped bytes:
 
@@ -163,7 +163,7 @@ else:
 
     from itertools import imap, izip  # NOQA
 
-    def _escape_strings(val):
+    def _ascii_escaped(val):
         """In py2 bytes and str are the same type, so return if it's a bytes
         object, return it unchanged if it is a full ascii string,
         otherwise escape it into its binary form.