Skip to content

Commit ca0105e

Browse files
authored
1 parent ea403c4 commit ca0105e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

tools/azure-sdk-tools/packaging_tools/multiapi_combiner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ def _get_names_by_api_version(api_version: str):
271271
def _get_operation(code_model: "CodeModel", name: str) -> Operation:
272272
return Operation(code_model, name, operation_group=self)
273273

274-
self.operations = _combine_helper(
274+
self.operations = [o for o in _combine_helper(
275275
code_model=self.code_model,
276276
sorted_api_versions=api_versions,
277277
get_cls=_get_operation,
278278
get_names_by_api_version=_get_names_by_api_version,
279-
)
279+
) if o.name != "_api_version"]
280280

281281
def doc(self, async_mode: bool) -> str:
282282
return strip_version_from_docs(self.generated_class(async_mode).__doc__)

tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/operation_group.py.jinja2

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ class {{ operation_group.name }}{{ "(" + operation_group.name.replace("Operation
1818
self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
1919
self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
2020
{% else %}
21-
@property
22-
def _api_version(self)-> str:
23-
return self._get_api_version(None)
21+
def _api_version(self, op_name: str) -> str:
22+
return self._get_api_version(op_name)
2423

2524
{% endif %}
2625
{% for operation in operation_group.operations %}

0 commit comments

Comments
 (0)