VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

use hexdump to print strings of objects

Browse Source
This commit is contained in:
Frank Morgner
2013-07-09 07:20:18 +02:00
parent 8c1694f5b4
commit 68e01ac452
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardFilesystem.py
View File

@@ -25,7 +25,7 @@ import logging
from virtualsmartcard.ConstantDefinitions import DCB, FDB, FID, LCB, REF from virtualsmartcard.ConstantDefinitions import DCB, FDB, FID, LCB, REF
from virtualsmartcard.TLVutils import * from virtualsmartcard.TLVutils import *
from virtualsmartcard.SWutils import SW, SwError from virtualsmartcard.SWutils import SW, SwError
from virtualsmartcard.utils import stringtoint, inttostring from virtualsmartcard.utils import stringtoint, inttostring, hexdump
def isEqual(list): def isEqual(list):
"""Returns True, if all items are equal, otherwise False""" """Returns True, if all items are equal, otherwise False"""
@@ -198,7 +198,8 @@ def prettyprint_anything(indent, thing):
if isinstance(newvalue, int): if isinstance(newvalue, int):
s = s + "\n" + indent + attribute + (16-len(attribute))*" " + "0x%x" % (newvalue) s = s + "\n" + indent + attribute + (16-len(attribute))*" " + "0x%x" % (newvalue)
elif isinstance(newvalue, str): elif isinstance(newvalue, str):
s = s + "\n" + indent + attribute + (16-len(attribute))*" " + "length %d" % len(newvalue) s = s + "\n" + indent + attribute + (16-len(attribute))*" " + "length %d:" % len(newvalue)
s = s + "\n" + indent + hexdump(newvalue, len(indent))
elif isinstance(newvalue, list): elif isinstance(newvalue, list):
s = s + "\n" + indent + attribute + (16-len(attribute))*" " s = s + "\n" + indent + attribute + (16-len(attribute))*" "
for item in newvalue: for item in newvalue:
@@ -473,9 +474,9 @@ class DF(File):
return file return file
# not found # not found
if isinstance(value, int): if isinstance(value, int):
logging.debug("file not found %s=%x" % (attribute, value)) logging.debug("file (%s=%x) not found in:\n%s" % (attribute, value, self))
elif isinstance(value, str): elif isinstance(value, str):
logging.debug("file not found %s=%r" % (attribute, value)) logging.debug("file (%s=%r) not found in:\n%s" % (attribute, value, self))
raise SwError(SW["ERR_FILENOTFOUND"]) raise SwError(SW["ERR_FILENOTFOUND"])
def remove(self, file): def remove(self, file):