cleanup for python2.6

Made some small changes to comply with python2.6:

- The first one allows the use of unittest.skipIf, which is not available on 2.6 but backported on django.utils.unittest.

- the second one is just the avoidance of set literals.