fix mock import location

Author: ohmayr

gapic/templates/%namespace/%name_%version/%sub/_compat/legacy_helpers.py.j2

@@ -2,13 +2,8 @@
 
 {% block content %}
 
-import os
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:  # pragma: NO COVER
-    import mock
+import os
 
 from google.auth.exceptions import MutualTLSChannelError          # type: ignore
 

gapic/templates/tests/unit/gapic/%name_%version/%sub/test_legacy_helpers.py.j2

@@ -5,6 +5,13 @@
 
 import os
 
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+except ImportError:  # pragma: NO COVER
+    import mock
+
+
 from {% if api.naming.module_namespace %}{{ api.naming.module_namespace|join('.') }}.{% endif %}
     {{- api.naming.versioned_module_name }}._compat import legacy_helpers
 

tests/integration/goldens/asset/google/cloud/asset_v1/_compat/legacy_helpers.py

@@ -13,13 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import os
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:  # pragma: NO COVER
-    import mock
+import os
 
 from google.auth.exceptions import MutualTLSChannelError          # type: ignore
 

tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_legacy_helpers.py

@@ -16,6 +16,13 @@
 
 import os
 
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+except ImportError:  # pragma: NO COVER
+    import mock
+
+
 from google.cloud.asset_v1._compat import legacy_helpers
 
 

tests/integration/goldens/redis/google/cloud/redis_v1/_compat/legacy_helpers.py

@@ -13,13 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import os
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-except ImportError:  # pragma: NO COVER
-    import mock
+import os
 
 from google.auth.exceptions import MutualTLSChannelError          # type: ignore
 

tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_legacy_helpers.py

@@ -16,6 +16,13 @@
 
 import os
 
+# try/except added for compatibility with python < 3.8
+try:
+    from unittest import mock
+except ImportError:  # pragma: NO COVER
+    import mock
+
+
 from google.cloud.redis_v1._compat import legacy_helpers