Index: google-api-python-client-2.20.0/tests/test__auth.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test__auth.py +++ google-api-python-client-2.20.0/tests/test__auth.py @@ -18,7 +18,7 @@ import google.auth.credentials import google_auth_httplib2 import httplib2 import oauth2client.client -import unittest2 as unittest +import unittest from googleapiclient import _auth Index: google-api-python-client-2.20.0/tests/test_channel.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_channel.py +++ google-api-python-client-2.20.0/tests/test_channel.py @@ -3,7 +3,7 @@ from __future__ import absolute_import __author__ = "jcgregorio@google.com (Joe Gregorio)" -import unittest2 as unittest +import unittest import datetime from googleapiclient import channel Index: google-api-python-client-2.20.0/tests/test_discovery_cache.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_discovery_cache.py +++ google-api-python-client-2.20.0/tests/test_discovery_cache.py @@ -18,7 +18,7 @@ """Discovery document cache tests.""" import datetime -import unittest2 as unittest +import unittest import mock Index: google-api-python-client-2.20.0/tests/test_discovery.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_discovery.py +++ google-api-python-client-2.20.0/tests/test_discovery.py @@ -35,7 +35,7 @@ import os import pickle import re import sys -import unittest2 as unittest +import unittest import urllib from parameterized import parameterized Index: google-api-python-client-2.20.0/tests/test_errors.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_errors.py +++ google-api-python-client-2.20.0/tests/test_errors.py @@ -21,7 +21,7 @@ from __future__ import absolute_import __author__ = "afshar@google.com (Ali Afshar)" -import unittest2 as unittest +import unittest import httplib2 Index: google-api-python-client-2.20.0/tests/test_http.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_http.py +++ google-api-python-client-2.20.0/tests/test_http.py @@ -31,7 +31,7 @@ import io import logging import mock import os -import unittest2 as unittest +import unittest import urllib import random import socket Index: google-api-python-client-2.20.0/tests/test_json_model.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_json_model.py +++ google-api-python-client-2.20.0/tests/test_json_model.py @@ -26,7 +26,7 @@ import httplib2 import json import pkg_resources import platform -import unittest2 as unittest +import unittest import urllib import googleapiclient.model Index: google-api-python-client-2.20.0/tests/test_mocks.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_mocks.py +++ google-api-python-client-2.20.0/tests/test_mocks.py @@ -24,7 +24,7 @@ __author__ = "jcgregorio@google.com (Joe import httplib2 import os -import unittest2 as unittest +import unittest from googleapiclient.errors import HttpError from googleapiclient.errors import UnexpectedBodyError Index: google-api-python-client-2.20.0/tests/test_model.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_model.py +++ google-api-python-client-2.20.0/tests/test_model.py @@ -23,7 +23,7 @@ from __future__ import absolute_import __author__ = "jcgregorio@google.com (Joe Gregorio)" -import unittest2 as unittest +import unittest from googleapiclient.model import BaseModel from googleapiclient.model import makepatch Index: google-api-python-client-2.20.0/tests/test_protobuf_model.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_protobuf_model.py +++ google-api-python-client-2.20.0/tests/test_protobuf_model.py @@ -22,7 +22,7 @@ from __future__ import absolute_import __author__ = "mmcdonald@google.com (Matt McDonald)" -import unittest2 as unittest +import unittest import httplib2 from googleapiclient.model import ProtocolBufferModel Index: google-api-python-client-2.20.0/tests/test_schema.py =================================================================== --- google-api-python-client-2.20.0.orig/tests/test_schema.py +++ google-api-python-client-2.20.0/tests/test_schema.py @@ -19,7 +19,7 @@ __author__ = "jcgregorio@google.com (Joe import json import os -import unittest2 as unittest +import unittest from googleapiclient.schema import Schemas