Fix up Mandrake 8.2 breakage from last commit

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Remove unused variables and imports pointed out by pyflakes

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Update Ubuntu unittests to handle new support

Signed-off-by: Chris Lalancette <clalancette@gmail.com>