PEP-8 test_descriptor.py.
Merge branch 'pep8-descriptor' into 2.6-dev
Merge branch '2.6-dev'