between py3k and trunk; merge new tests from trunk to py3k. (See issue #7528.)
Attach a file by drag & drop or click to upload
