tests: drop use of 'unittest2' (#1564)

Author: tseaver

noxfile.py

@@ -27,7 +27,6 @@
     "pytest-cov",
     "webtest",
     "coverage",
-    "unittest2",
     "mock",
 ]
 

tests/test__auth.py

@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
 import mock
 
 import google.auth.credentials
 import google_auth_httplib2
 import httplib2
 import oauth2client.client
-import unittest2 as unittest
 
 from googleapiclient import _auth
 

tests/test_channel.py

@@ -3,8 +3,8 @@
 
 __author__ = "[email protected] (Joe Gregorio)"
 
-import unittest2 as unittest
 import datetime
+import unittest
 
 from googleapiclient import channel
 from googleapiclient import errors

tests/test_discovery.py

@@ -35,7 +35,7 @@
 import pickle
 import re
 import sys
-import unittest2 as unittest
+import unittest
 import urllib
 
 from parameterized import parameterized

tests/test_discovery_cache.py

@@ -18,7 +18,7 @@
 """Discovery document cache tests."""
 
 import datetime
-import unittest2 as unittest
+import unittest
 
 import mock
 

tests/test_errors.py

@@ -21,7 +21,7 @@
 __author__ = "[email protected] (Ali Afshar)"
 
 
-import unittest2 as unittest
+import unittest
 import httplib2
 
 

tests/test_http.py

@@ -31,7 +31,7 @@
 import logging
 import mock
 import os
-import unittest2 as unittest
+import unittest
 import urllib
 import random
 import socket

tests/test_json_model.py

@@ -26,7 +26,7 @@
 import json
 import pkg_resources
 import platform
-import unittest2 as unittest
+import unittest
 import urllib
 
 import googleapiclient.model

tests/test_mocks.py

@@ -24,7 +24,7 @@
 
 import httplib2
 import os
-import unittest2 as unittest
+import unittest
 
 from googleapiclient.errors import HttpError
 from googleapiclient.errors import UnexpectedBodyError

tests/test_model.py

@@ -23,7 +23,7 @@
 
 __author__ = "[email protected] (Joe Gregorio)"
 
-import unittest2 as unittest
+import unittest
 
 from googleapiclient.model import BaseModel
 from googleapiclient.model import makepatch

tests/test_protobuf_model.py

@@ -22,7 +22,7 @@
 
 __author__ = "[email protected] (Matt McDonald)"
 
-import unittest2 as unittest
+import unittest
 import httplib2
 
 from googleapiclient.model import ProtocolBufferModel

tests/test_schema.py

@@ -19,7 +19,7 @@
 
 import json
 import os
-import unittest2 as unittest
+import unittest
 
 from googleapiclient.schema import Schemas