Make test for semaphore tracker capture and check the debug output.
Add line explaining the "%sort" test.
(grafted from 1ea833ecaf5a9d43a886e9e73b4e2551d0d5b548)
Add line explaining the "%sort" test.
Add the same dummy type that is used in dictionaries.
Emphasize that people should not override __import__.

With importlib getting used more and more, changing __import__ will
not work as well as people used to hope as it will potentially bypass
importers, etc. It also will not work with importlib.import_module()
as it uses "importlib.__import__" (i.e. importlib's implementation of
import) directly and not builtins.__import__.
merge emphasized discouragement of overriding __import__
Issue #18755: Allow imp.load_*() loaders to have get_data() called
multiple times.
NEW entry for issue #18755
merge for issue #18755
merge for issue #18755
Delete merge markers
Close #17702: On error, os.environb now removes suppress the except context
when raising a new KeyError with the original key.
(Merge 3.3) Close #17702: On error, os.environb now removes suppress the except
context when raising a new KeyError with the original key.
Make test_import more robust and stop using assertRaisesRegexp().
Stop using assertEquals.
Issue #18394: Explicitly close the file object cgi.FieldStorage
caches.

Eliminates the ResoureWarning raised during testing.

Patch also independently written by Vajrasky Kok.
#18796: improve documentation of the file argument of dis.show_code.  Initial patch by Vajrasky Kok.
#18798: fix typo in test_fcntl.  Patch by Vajrasky Kok.
#18798: merge typo fix from 3.3 and also use two unused variables.
Issue #17741: use composition, rather than inheritance, for xml.etree.iterparse's result class.
Patch by Stefan Behnel.