Merge e9154b1 into 4b3cc1b

requirements-test.txt

@@ -1,6 +1,7 @@
 -r requirements.txt
 nose
 savalidation
+unittest2
 
 # For testing PostgreSQL specific operations...
 testing.postgresql

tests/helpers.py

@@ -18,8 +18,8 @@
 from json import JSONEncoder
 import sys
 import types
-from unittest import skipUnless as skip_unless
-from unittest import TestCase
+from unittest2 import skipUnless as skip_unless
+from unittest2 import TestCase
 import uuid
 
 from flask import Flask

tests/test_bulk.py

@@ -10,7 +10,7 @@
 # License version 3 and under the 3-clause BSD license. For more
 # information, see LICENSE.AGPL and LICENSE.BSD.
 """Unit tests for the JSON API Bulk extension."""
-from unittest import skip
+from unittest2 import skip
 
 from sqlalchemy import Column
 from sqlalchemy import Integer

tests/test_creating.py

@@ -21,7 +21,7 @@
 """
 from __future__ import division
 from datetime import datetime
-from unittest import skip
+from unittest2 import skip
 
 import dateutil
 from sqlalchemy import Column

tests/test_deleting.py

@@ -18,7 +18,7 @@
 specification.
 
 """
-from unittest import skip
+from unittest2 import skip
 
 from sqlalchemy import Column
 from sqlalchemy import ForeignKey

tests/test_fetching.py

@@ -19,7 +19,7 @@
 
 """
 from operator import itemgetter
-from unittest import skip
+from unittest2 import skip
 
 from sqlalchemy import Column
 from sqlalchemy import ForeignKey

tests/test_filtering.py

@@ -14,7 +14,7 @@
 from datetime import datetime
 from datetime import time
 from operator import itemgetter
-from unittest import skip
+from unittest2 import skip
 
 # This import is unused but is required for testing on PyPy. CPython can
 # use psycopg2, but PyPy can only use psycopg2cffi.

tests/test_jsonapi/test_server_responsibilities.py

@@ -18,7 +18,7 @@
 .. _Server Responsibilities: http://jsonapi.org/format/#content-negotiation-servers
 
 """
-from unittest import skip
+from unittest2 import skip
 
 from sqlalchemy import Column
 from sqlalchemy import Unicode

tests/test_manager.py

@@ -10,7 +10,7 @@
 # License version 3 and under the 3-clause BSD license. For more
 # information, see LICENSE.AGPL and LICENSE.BSD.
 """Unit tests for the :mod:`flask_restless.manager` module."""
-from unittest import skip
+from unittest2 import skip
 
 from flask import Flask
 from sqlalchemy import Column

tests/test_metadata.py

@@ -10,7 +10,7 @@
 # License version 3 and under the 3-clause BSD license. For more
 # information, see LICENSE.AGPL and LICENSE.BSD.
 """Unit tests for metadata in server responses."""
-from unittest import skip
+from unittest2 import skip
 
 from sqlalchemy import Column
 from sqlalchemy import Integer

tests/test_updating.py

@@ -21,7 +21,7 @@
 from __future__ import division
 
 from datetime import datetime
-from unittest import skip
+from unittest2 import skip
 
 try:
     from flask.ext.sqlalchemy import SQLAlchemy

tests/test_validation.py

@@ -18,7 +18,7 @@
 client.
 
 """
-from unittest import skipUnless as skip_unless
+from unittest2 import skipUnless as skip_unless
 import sys
 
 from sqlalchemy import Column