Fix a Python 2.6 formatting problem
Merge remote-tracking branch 'origin/python-mccabe' into python-mccabe