Issue #20363. Fixed BytesWarning triggerred by test suite.

serhiy-storchaka · serhiy-storchaka · commit a26b3f183d11 · 2014-02-06T22:52:23.000+02:00
Patch by Berker Peksag.
diff --git a/Lib/base64.py b/Lib/base64.py
@@ -362,7 +362,7 @@ def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'):
     if adobe:
         if not (b.startswith(_A85START) and b.endswith(_A85END)):
             raise ValueError("Ascii85 encoded byte sequences must be bracketed "
-                             "by {} and {}".format(_A85START, _A85END))
+                             "by {!r} and {!r}".format(_A85START, _A85END))
         b = b[2:-2] # Strip off start/end markers
     #
     # We have to go through this stepwise, so as to ignore spaces and handle
diff --git a/Lib/configparser.py b/Lib/configparser.py
@@ -286,7 +286,7 @@ def __init__(self, source=None, filename=None):
             raise ValueError("Required argument `source' not given.")
         elif filename:
             source = filename
-        Error.__init__(self, 'Source contains parsing errors: %s' % source)
+        Error.__init__(self, 'Source contains parsing errors: %r' % source)
         self.source = source
         self.errors = []
         self.args = (source, )
@@ -322,7 +322,7 @@ class MissingSectionHeaderError(ParsingError):
     def __init__(self, filename, lineno, line):
         Error.__init__(
             self,
-            'File contains no section headers.\nfile: %s, line: %d\n%r' %
+            'File contains no section headers.\nfile: %r, line: %d\n%r' %
             (filename, lineno, line))
         self.source = filename
         self.lineno = lineno
diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py
@@ -300,5 +300,5 @@ def post_to_server(self, data, auth=None):
             result = 200, 'OK'
         if self.show_response:
             dashes = '-' * 75
-            self.announce('%s%s%s' % (dashes, data, dashes))
+            self.announce('%s%r%s' % (dashes, data, dashes))
         return result
diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py
@@ -172,7 +172,7 @@ class HashRandomizationTests:
     # an object to be tested
 
     def get_hash_command(self, repr_):
-        return 'print(hash(eval(%r.decode("utf-8"))))' % repr_.encode("utf-8")
+        return 'print(hash(eval(%a)))' % repr_
 
     def get_hash(self, repr_, seed=None):
         env = os.environ.copy()

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ def a85decode(b, *, foldspaces=False, adobe=False, ignorechars=b' \t\n\r\v'):`
`362`	`362`	`if adobe:`
`363`	`363`	`if not (b.startswith(_A85START) and b.endswith(_A85END)):`
`364`	`364`	`raise ValueError("Ascii85 encoded byte sequences must be bracketed "`
`365`		`- "by {} and {}".format(_A85START, _A85END))`
	`365`	`+ "by {!r} and {!r}".format(_A85START, _A85END))`
`366`	`366`	`b = b[2:-2] # Strip off start/end markers`
`367`	`367`	`#`
`368`	`368`	`# We have to go through this stepwise, so as to ignore spaces and handle`