From 6d9ec70ce4056d0dc0063d5e3818189de75a193c Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Wed, 18 Jul 2018 18:12:59 -0700 Subject: [PATCH] Revert a change to remove imports of the types module from __init__.py (#78) --- dialogflow_v2/__init__.py | 1 + dialogflow_v2beta1/__init__.py | 1 + synth.py | 9 --------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dialogflow_v2/__init__.py b/dialogflow_v2/__init__.py index adbeaddd5..c1b68e513 100755 --- a/dialogflow_v2/__init__.py +++ b/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/dialogflow_v2beta1/__init__.py b/dialogflow_v2beta1/__init__.py index cb67ab69a..c319acbca 100644 --- a/dialogflow_v2beta1/__init__.py +++ b/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/synth.py b/synth.py index 64af494f3..60e61713a 100644 --- a/synth.py +++ b/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',