Commit 3dedfa7086bf580052723018270e79f6ff6ad381

Authored by Christian Herdtweck
1 parent cd60c369

replace logging.info with log.info in json2ascii

Showing 1 changed file with 8 additions and 8 deletions
oletools/olevba.py
@@ -1687,14 +1687,14 @@ def json2ascii(json_obj, encoding='utf8', errors='replace'): @@ -1687,14 +1687,14 @@ def json2ascii(json_obj, encoding='utf8', errors='replace'):
1687 elif isinstance(json_obj, str): 1687 elif isinstance(json_obj, str):
1688 dencoded = json_obj.decode(encoding, errors).encode(encoding, errors) 1688 dencoded = json_obj.decode(encoding, errors).encode(encoding, errors)
1689 if dencoded != str: 1689 if dencoded != str:
1690 - logging.info('json2ascii: replaced: {0} (len {1})'  
1691 - .format(json_obj, len(json_obj)))  
1692 - logging.info('json2ascii: with: {0} (len {1})'  
1693 - .format(dencoded, len(dencoded))) 1690 + log.info('json2ascii: replaced: {0} (len {1})'
  1691 + .format(json_obj, len(json_obj)))
  1692 + log.info('json2ascii: with: {0} (len {1})'
  1693 + .format(dencoded, len(dencoded)))
1694 return dencoded 1694 return dencoded
1695 elif isinstance(json_obj, unicode): 1695 elif isinstance(json_obj, unicode):
1696 - logging.info('json2ascii: replaced: {0}'  
1697 - .format(json_obj.encode(encoding, errors))) 1696 + log.info('json2ascii: replaced: {0}'
  1697 + .format(json_obj.encode(encoding, errors)))
1698 # cannot put original into logger 1698 # cannot put original into logger
1699 # print 'original: ' json_obj 1699 # print 'original: ' json_obj
1700 return json_obj.encode(encoding, errors) 1700 return json_obj.encode(encoding, errors)
@@ -1705,8 +1705,8 @@ def json2ascii(json_obj, encoding='utf8', errors='replace'): @@ -1705,8 +1705,8 @@ def json2ascii(json_obj, encoding='utf8', errors='replace'):
1705 for item in json_obj: 1705 for item in json_obj:
1706 item = json2ascii(item) 1706 item = json2ascii(item)
1707 else: 1707 else:
1708 - logging.debug('unexpected type in json2ascii: {0} -- leave as is'  
1709 - .format(type(json_obj))) 1708 + log.debug('unexpected type in json2ascii: {0} -- leave as is'
  1709 + .format(type(json_obj)))
1710 return json_obj 1710 return json_obj
1711 1711
1712 1712