Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).