[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/41'

[teor at torproject.org]

commit e748a5f28ec9de1b0a2b90fcbe63e76a87d74496
Merge: f21ca55 f9d27ae
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 08:23:49 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/41'

 lib/chutney/Debug.py              | 3 +++
 lib/chutney/Host.py               | 4 ++++
 lib/chutney/Templating.py         | 4 +++-
 lib/chutney/TorNet.py             | 4 +++-
 lib/chutney/Traffic.py            | 3 +++
 lib/chutney/Util.py               | 5 ++++-
 lib/chutney/__init__.py           | 4 ++++
 scripts/chutney_tests/__init__.py | 4 ++++
 scripts/chutney_tests/verify.py   | 6 +++++-
 9 files changed, 33 insertions(+), 4 deletions(-)

diff --cc lib/chutney/TorNet.py
index 2b91dfb,e47907c..ea3b320
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@@ -7,20 -7,21 +7,22 @@@
  #  restrict, so long as you retain the above notice(s) and this license
  #  in all redistributed copies and derived works.  There is no warranty.
  
+ # Future imports for Python 2.7, mandatory in 3.0
+ from __future__ import division
  from __future__ import print_function
- from __future__ import with_statement
+ from __future__ import unicode_literals
  
  import cgitb
 +import errno
 +import importlib
  import os
 +import platform
 +import re
  import signal
 +import shutil
  import subprocess
  import sys
 -import re
 -import errno
  import time
 -import shutil
 -import importlib
  
  from chutney.Debug import debug_flag, debug