1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
diff --git a/tests/test__auth.py b/tests/test__auth.py
index d43fe68..7f9df84 100644
--- a/tests/test__auth.py
+++ b/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
diff --git a/tests/test_channel.py b/tests/test_channel.py
index 4141353..2651fcd 100644
--- a/tests/test_channel.py
+++ b/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
diff --git a/tests/test_discovery.py b/tests/test_discovery.py
index b41051a..ba5f1ba 100644
--- a/tests/test_discovery.py
+++ b/tests/test_discovery.py
@@ -37,7 +37,7 @@ import os
import pickle
import re
import sys
-import unittest2 as unittest
+import unittest
import mock
diff --git a/tests/test_discovery_cache.py b/tests/test_discovery_cache.py
index 1786406..39871fe 100644
--- a/tests/test_discovery_cache.py
+++ b/tests/test_discovery_cache.py
@@ -18,7 +18,7 @@
"""Discovery document cache tests."""
import datetime
-import unittest2 as unittest
+import unittest
import mock
diff --git a/tests/test_errors.py b/tests/test_errors.py
index e4d2f09..affd2da 100644
--- a/tests/test_errors.py
+++ b/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
diff --git a/tests/test_http.py b/tests/test_http.py
index b92e63f..f60d21b 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -35,7 +35,7 @@ import io
import logging
import mock
import os
-import unittest2 as unittest
+import unittest
import random
import socket
import ssl
diff --git a/tests/test_json_model.py b/tests/test_json_model.py
index 006eb47..f1d2116 100644
--- a/tests/test_json_model.py
+++ b/tests/test_json_model.py
@@ -27,7 +27,7 @@ import copy
import json
import os
import platform
-import unittest2 as unittest
+import unittest
import httplib2
import googleapiclient.model
diff --git a/tests/test_mocks.py b/tests/test_mocks.py
index a456b9e..2fd6517 100644
--- a/tests/test_mocks.py
+++ b/tests/test_mocks.py
@@ -24,7 +24,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
import httplib2
import os
-import unittest2 as unittest
+import unittest
from googleapiclient.errors import HttpError
from googleapiclient.errors import UnexpectedBodyError
diff --git a/tests/test_model.py b/tests/test_model.py
index 6506cfc..1d48194 100644
--- a/tests/test_model.py
+++ b/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
diff --git a/tests/test_protobuf_model.py b/tests/test_protobuf_model.py
index 465d120..bcd71ab 100644
--- a/tests/test_protobuf_model.py
+++ b/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
import googleapiclient.model
diff --git a/tests/test_schema.py b/tests/test_schema.py
index c1216a5..127a517 100644
--- a/tests/test_schema.py
+++ b/tests/test_schema.py
@@ -19,7 +19,7 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
import json
import os
-import unittest2 as unittest
+import unittest
from googleapiclient.schema import Schemas
<Paste>
|
