#11182: remove the unused and undocumented pydoc.Scanner class.  Patch by Martin Morrison.
Fix uploadTestCase to work even when HTTPSConnection is not available.
#17779: test_osx_env now works with unittest test discovery.  Patch by Zachary Ware.
#17779: merge with 3.3.
#17789: test_random now works with unittest test discovery.  Patch by Zachary Ware.
#17789: merge with 3.3.
#17790: test_set now works with unittest test discovery.  Patch by Zachary Ware.
#17790: merge with 3.3.
Fix indentation.
Merge indentation fix from 3.3.
Minor typo in example.
Merge 3.3
#17413: make sure settrace funcs get passed exception instances for 'value'.

Patch by Ingrid Cheung and Brendan McLoughlin.
Merge #17413: make sure settrace funcs get passed exception instances for 'value'.

Patch by Ingrid Cheung and Brendan McLoughlin.