LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12475: qa: Fix python TypeError in script.py

Browse source 
fa41d68a2 qa: Fix python TypeError in script.py (MarcoFalke)

Pull request description:

  `__repr__` returns string, so don't mix it with byte strings.

  This fixes

  ```
  TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'str'

Tree-SHA512: fac06e083f245209bc8a36102217580b0f6186842f4e52a686225111b0b96ff93c301640ff5e7ddef6a5b4f1689071b16a9a8dc80f28e2b060ddee29edd24ec7
This commit is contained in:
Wladimir J. van der Laan 2018-03-05 17:31:48 +01:00
commit 07d2d2a21c
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/functional/test_framework/script.py
View file

@ -526,11 +526,9 @@ class CScript(bytes):
yield CScriptOp(opcode) yield CScriptOp(opcode)
def __repr__(self): def __repr__(self):
# For Python3 compatibility add b before strings so testcases don't
# need to change
def _repr(o): def _repr(o):
if isinstance(o, bytes): if isinstance(o, bytes):
return b"x('%s')" % hexlify(o).decode('ascii') return "x('%s')" % hexlify(o).decode('ascii')
else: else:
return repr(o) return repr(o)