From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 6 Feb 2014 20:49:45 +0000 (+0200)
Subject: Issue #20363. Fixed BytesWarning triggerred by test suite.
X-Git-Tag: v3.4.0rc1~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc27a050a7bef228c5e125c4de938faef56533fd;p=thirdparty%2FPython%2Fcpython.git

Issue #20363. Fixed BytesWarning triggerred by test suite.
Patch by Berker Peksag.
---

diff --git a/Lib/configparser.py b/Lib/configparser.py
index aa401fc0a337..aebf8a0fb902 100644
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -286,7 +286,7 @@ class ParsingError(Error):
             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
index 55656c235388..b49f86fe5814 100644
--- a/Lib/distutils/command/register.py
+++ b/Lib/distutils/command/register.py
@@ -300,5 +300,5 @@ Your selection [default 1]: ''', log.INFO)
             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
index e3ab6e4385a9..22ebbccb22d2 100644
--- a/Lib/test/test_hash.py
+++ b/Lib/test/test_hash.py
@@ -138,7 +138,7 @@ class HashRandomizationTests:
     # an object to be tested
 
     def get_hash_command(self, repr_):
-        return 'print(hash(%s))' % repr_
+        return 'print(hash(eval(%a)))' % repr_
 
     def get_hash(self, repr_, seed=None):
         env = os.environ.copy()