Always use third party mock (#637)

Author: c24t

tests/unit/common/monitored_resource_util/test_k8s_utils.py

@@ -12,14 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import mock
-except ImportError:
-    from unittest import mock
-
 import os
 import unittest
 
+import mock
+
 from opencensus.common.monitored_resource import k8s_utils
 
 

tests/unit/common/monitored_resource_util/test_monitored_resource.py

@@ -16,14 +16,14 @@
 import os
 import sys
 
+import mock
+
 from opencensus.common.monitored_resource import monitored_resource
 
 if sys.version_info < (3,):
     import unittest2 as unittest
-    import mock
 else:
     import unittest
-    from unittest import mock
 
 
 @contextmanager

tests/unit/common/test_resource.py

@@ -14,14 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import mock
-except ImportError:
-    from unittest import mock
-
 import os
 import unittest
 
+import mock
+
 from opencensus.common import resource as resource_module
 from opencensus.common.resource import Resource
 

tests/unit/log/test_log.py

@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 from contextlib import contextmanager
 import logging
+import sys
+
+import mock
 
 from opencensus import log
 
 if sys.version_info < (3,):
     import unittest2 as unittest
-    import mock
 else:
     import unittest
-    from unittest import mock
 
 
 @contextmanager

tests/unit/stats/test_metric_utils.py

@@ -12,14 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import mock
-except ImportError:
-    from unittest import mock
-
 import datetime
 import unittest
 
+import mock
+
 from opencensus.metrics.export import metric_descriptor
 from opencensus.metrics.export import point
 from opencensus.metrics.export import value