Wireshark · Wireshark-commits: [Wireshark-commits] master 13c486c: html2text.py: Python 2.5 compatibility, improve Unicode support

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=13c486c33f9d3a015aaf0e4ee0c99643575cd235
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

13c486c by Peter Wu (peter@xxxxxxxxxxxxx):

    html2text.py: Python 2.5 compatibility, improve Unicode support
    
    Add support for Python 2.5 (remove unicode_literals import which does
    not seem to be necessary), check before using break_on_hyphens (without
    this option in Python 2.5, the output is uglier though) and avoid the
    'with' keyword.
    
    While at it, fix reading Unicode text from file in Python 2 (tested
    with: echo € | tools/html2text.py) and support reading from stdin using
    the '-' filename.
    
    Tested against Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 with the
    commands from the previous html2text.py commit message, and additionally
    with the Unicode character € as input (instead of the faq.py output).
    
    Change-Id: I3de3f7a4e7cf7d702463c3a59758803843338a54
    Reviewed-on: https://code.wireshark.org/review/7823
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  785fab7   packet-iec104: fix showing information objects if SQ flag is set
    adds  13c486c   html2text.py: Python 2.5 compatibility, improve Unicode support


Summary of changes:
 tools/html2text.py |   29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)