Remove the special 'enums' submodule (#300)

The creation of this submodule view was based on a misunderstanding of a desired feature: in the API in question, enums are already segregated into their own submodule, the name of which conflicts with `enums.py`

Author: software-dov

gapic/templates/%namespace/%name/__init__.py.j2

@@ -33,7 +33,6 @@ if sys.version_info < (3, 7):
 
 _lazy_name_to_package_map = {
     'types': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types',
-    'enums': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.enums',
   {%- for service in api.services.values()|sort(attribute='name')|unique(attribute='name') if service.meta.address.subpackage == api.subpackage_view %}
     '{{ service.client_name|snake_case }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.services.{{ service.name|snake_case }}.client',
     '{{ service.transport_name|snake_case }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.services.transports.base',
@@ -46,7 +45,7 @@ _lazy_type_to_package_map = {
     '{{ message.name }}':'{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types.{{ proto.module_name }}',
 {%- endfor %}
 {%- for enum in proto.enums.values() %}
-    '{{ enum.name }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.enums',
+    '{{ enum.name }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types.{{ proto.module_name }}',
 {%- endfor %}{%- endfor %}
 }
 
@@ -70,11 +69,10 @@ def __getattr__(name):  # Requires Python >= 3.7
     elif name.endswith('Client'):
         module = __getattr__(to_snake_case(name))
         sub_mod_class = getattr(module, name)
-        enums = __getattr__('enums')
         klass = type(
             name,
             (sub_mod_class,),
-            {'__doc__': sub_mod_class.__doc__, 'enums': enums}
+            {'__doc__': sub_mod_class.__doc__}
         )
         globals()[name] = klass
         return klass

gapic/templates/%namespace/%name_%version/%sub/__init__.py.j2

@@ -34,12 +34,11 @@ if sys.version_info < (3, 7):
 
 _lazy_name_to_package_map = {
     'types': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types',
-    'enums': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.enums',
   {%- for service in api.services.values()|sort(attribute='name')|unique(attribute='name') if service.meta.address.subpackage == api.subpackage_view %}
     '{{ service.client_name|snake_case }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.services.{{ service.name|snake_case }}.client',
     '{{ service.transport_name|snake_case }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.services.transports.base',
     '{{ service.grpc_transport_name|snake_case }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.services.transports.grpc',
-  {%- endfor %}  {# Need to do types and enums #}
+  {%- endfor %}
 }
 
 _lazy_type_to_package_map = {
@@ -48,7 +47,7 @@ _lazy_type_to_package_map = {
     '{{ message.name }}':'{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types.{{ proto.module_name }}',
 {%- endfor %}
 {%- for enum in proto.enums.values() %}
-    '{{ enum.name }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.enums',
+    '{{ enum.name }}': '{% if api.naming.module_namespace %}{{ api.naming.module_namespace|join(".") }}.{% endif -%}{{ api.naming.versioned_module_name }}.types.{{ proto.module_name }}',
 {%- endfor %}{%- endfor %}{%- endfilter %}
 }
 
@@ -71,11 +70,10 @@ def __getattr__(name):  # Requires Python >= 3.7
     elif name.endswith('Client'):
         module = __getattr__(to_snake_case(name))
         sub_mod_class = getattr(module, name)
-        enums = __getattr__('enums')
         klass = type(
             name,
             (sub_mod_class,),
-            {'__doc__': sub_mod_class.__doc__, 'enums': enums}
+            {'__doc__': sub_mod_class.__doc__}
         )
         globals()[name] = klass
         return klass

gapic/templates/%namespace/%name_%version/%sub/enums.py.j2

@@ -20,9 +20,6 @@ from google.api_core import future
 from google.api_core import operations_v1
 from google.longrunning import operations_pb2
 {% endif -%}
-{% if api.protos.values()|selectattr('enums') -%}
-from {{ (api.naming.module_namespace + (api.naming.versioned_module_name,) + service.meta.address.subpackage)|join(".") }} import enums
-{% endif -%}
 {% for method in service.methods.values() -%}
 {% for ref_type in method.ref_types
    if not ((ref_type.ident.python_import.package == ('google', 'api_core') and ref_type.ident.python_import.module == 'operation')
@@ -446,12 +443,4 @@ def test_{{ message.name|snake_case }}_path():
 {% endwith -%}
 {% endfor -%}
 
-{% with enums = [] -%}{% for p in api.protos.values() if p.file_to_generate -%}{% for e in p.enums.values() if e.ident.module == service.meta.address.module -%}{% do enums.append(e) %}
-{% if enums -%}
-def test_enum_path():
-{%- for e in enums %}
-    assert enums.{{ e.name }} == {{ e.ident.module }}.{{ e.name }}
-{%- endfor %}
-{% endif -%}
-{% endfor -%}{% endfor -%}{% endwith -%}
 {% endblock %}