Skip to content

Commit

Permalink
Issue python#20363. Fixed BytesWarning triggerred by test suite.
Browse files Browse the repository at this point in the history
Patch by Berker Peksag.
  • Loading branch information
serhiy-storchaka committed Feb 6, 2014
2 parents a146bef + bc27a05 commit a26b3f1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Lib/base64.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Lib/configparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, )
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Lib/distutils/command/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Lib/test/test_hash.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit a26b3f1

Please sign in to comment.