Using unittest2 in place of unittest for Python 2.6 compatibility in …

…testing.
pferate · Mar 5, 2015 · fde7488 · fde7488
1 parent fbae355
commit fde7488
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/tests/test_channel.py b/tests/test_channel.py
@@ -3,7 +3,7 @@
 
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 
-import unittest
+import unittest2 as unittest
 import datetime
 
 from googleapiclient import channel

diff --git a/tests/test_discovery.py b/tests/test_discovery.py
@@ -36,7 +36,7 @@
 import os
 import pickle
 import sys
-import unittest
+import unittest2 as unittest
 
 from googleapiclient.discovery import _fix_up_media_upload
 from googleapiclient.discovery import _fix_up_method_description

diff --git a/tests/test_errors.py b/tests/test_errors.py
@@ -21,7 +21,7 @@
 __author__ = 'afshar@google.com (Ali Afshar)'
 
 
-import unittest
+import unittest2 as unittest
 import httplib2
 
 

diff --git a/tests/test_http.py b/tests/test_http.py
@@ -32,7 +32,7 @@
 import httplib2
 import logging
 import os
-import unittest
+import unittest2 as unittest
 import random
 import time
 

diff --git a/tests/test_json_model.py b/tests/test_json_model.py
@@ -26,7 +26,7 @@
 import copy
 import json
 import os
-import unittest
+import unittest2 as unittest
 import httplib2
 import googleapiclient.model
 

diff --git a/tests/test_mocks.py b/tests/test_mocks.py
@@ -24,7 +24,7 @@
 
 import httplib2
 import os
-import unittest
+import unittest2 as unittest
 
 from googleapiclient.errors import HttpError
 from googleapiclient.errors import UnexpectedBodyError

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -23,7 +23,7 @@
 
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 
-import unittest
+import unittest2 as unittest
 
 from googleapiclient.model import BaseModel
 from googleapiclient.model import makepatch

diff --git a/tests/test_protobuf_model.py b/tests/test_protobuf_model.py
@@ -22,7 +22,7 @@
 
 __author__ = 'mmcdonald@google.com (Matt McDonald)'
 
-import unittest
+import unittest2 as unittest
 import httplib2
 import googleapiclient.model
 

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -19,7 +19,7 @@
 
 import json
 import os
-import unittest
+import unittest2 as unittest
 
 from googleapiclient.schema import Schemas
 

diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ deps = keyring
        django
        webtest
        nose
+       unittest2
 setenv = PYTHONPATH=../google_appengine
 
 [testenv:py26]