minor Py2.6+ code simplification
avoid unnecessary indentation level
remove unused code
fix cygdb and its tests when run in Py3