From fde7488a6203817f433d52ad97c86136abf23073 Mon Sep 17 00:00:00 2001 From: Pat Ferate Date: Thu, 5 Mar 2015 08:52:09 -0800 Subject: [PATCH] Using unittest2 in place of unittest for Python 2.6 compatibility in testing. --- tests/test_channel.py | 2 +- tests/test_discovery.py | 2 +- tests/test_errors.py | 2 +- tests/test_http.py | 2 +- tests/test_json_model.py | 2 +- tests/test_mocks.py | 2 +- tests/test_model.py | 2 +- tests/test_protobuf_model.py | 2 +- tests/test_schema.py | 2 +- tox.ini | 1 + 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/test_channel.py b/tests/test_channel.py index 2651fcdad38..414135344c0 100644 --- 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 index 2627bdbc67e..9ebf74d16de 100644 --- 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 index 0cef8923c23..9af84903d07 100644 --- 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 index b8136a57550..b47b9dc4fa3 100644 --- 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 index 16c7eed37c2..0de65134a12 100644 --- 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 index 34cc8a9747e..6ccc4277f8c 100644 --- 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 index 1d4819406d0..6506cfc634b 100644 --- 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 index bcd71abc7ae..465d12089c1 100644 --- 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 index 127a517c603..c1216a57edc 100644 --- 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 index 5a5dfbcbd63..1e868a05745 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ deps = keyring django webtest nose + unittest2 setenv = PYTHONPATH=../google_appengine [testenv:py26]