Issue #2153: modernize coding style of unittest.py, remove obsolete compatibility...