Use unittest2 where available, to support python <2.7

This commit is contained in:
sneakypete81 2013-05-11 18:11:42 +01:00
parent 7668deba43
commit 658e3ca9f1
8 changed files with 32 additions and 8 deletions

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
from tests import test_albums, test_photos, test_tags
class TestAlbumsV1(test_albums.TestAlbums):

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
from tests import test_base, test_albums, test_photos, test_tags
@unittest.skipIf(test_base.get_test_server_api() < 2, "Don't test future API versions")

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import openphoto
import test_base

View file

@ -1,6 +1,9 @@
import sys
import os
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import logging
import openphoto

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import os
import shutil
import openphoto

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import logging
import openphoto
import test_base

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import openphoto
import test_base

View file

@ -1,4 +1,7 @@
import unittest
try:
import unittest2 as unittest
except ImportError:
import unittest
import openphoto
import test_base