#16905: test_bufio now works with unittest test discovery.  Initial patch by Berker Peksag.
#16905: merge with 3.3.