Revert a change to remove imports of the types module from __init__.py (

#78)
googleapis · Jul 19, 2018 · a920994 · a920994
1 parent ab5f0ea
commit a920994
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/packages/google-cloud-dialogflow/dialogflow_v2/__init__.py b/packages/google-cloud-dialogflow/dialogflow_v2/__init__.py
@@ -14,6 +14,7 @@
 
 from __future__ import absolute_import
 
+from dialogflow_v2 import types
 from dialogflow_v2.gapic import agents_client
 from dialogflow_v2.gapic import contexts_client
 from dialogflow_v2.gapic import entity_types_client

diff --git a/packages/google-cloud-dialogflow/dialogflow_v2beta1/__init__.py b/packages/google-cloud-dialogflow/dialogflow_v2beta1/__init__.py
@@ -14,6 +14,7 @@
 
 from __future__ import absolute_import
 
+from dialogflow_v2beta1 import types
 from dialogflow_v2beta1.gapic import agents_client
 from dialogflow_v2beta1.gapic import contexts_client
 from dialogflow_v2beta1.gapic import documents_client

diff --git a/packages/google-cloud-dialogflow/synth.py b/packages/google-cloud-dialogflow/synth.py
@@ -42,9 +42,6 @@
 
     code_paths = ['tests/unit/gapic/**/*.py',
                   f'dialogflow_{version}/**/*.py']
-                  #,
-                  #f'dialogflow_{version}/__init__.py'
-                  #f'dialogflow_{version}/types.py']
 
     s.replace(
         code_paths, 'import google.cloud.dialogflow', 'import dialogflow')
@@ -72,12 +69,6 @@
     "# Copyright 2018 Google LLC",
     "# -*- coding: utf-8 -*-\n\g<0>")
 
-# __init__.py has an import that isn't used and causes errors
-s.replace(
-    ['dialogflow_v2/__init__.py', 'dialogflow_v2beta1/__init__.py'],
-    'from dialogflow_.*? import types\n',
-    '')
-
 # Docstring has an extra '\' at the end of it
 s.replace(
     'dialogflow_v2/gapic/agents_client.py',