Simplify opts merge

pulumi · Aug 22, 2019 · 5854fd5 · 5854fd5
1 parent e3d769c
commit 5854fd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/gen/python-templates/CustomResource.py b/pkg/gen/python-templates/CustomResource.py
@@ -76,7 +76,7 @@ def get(resource_name, api_version, kind, id, opts=None):
                resource's behavior.
         """
 
-        opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
+        opts = ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
         return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=opts)
 
     def translate_output_property(self, prop: str) -> str:

diff --git a/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py b/sdk/python/pulumi_kubernetes/apiextensions/CustomResource.py
@@ -76,7 +76,7 @@ def get(resource_name, api_version, kind, id, opts=None):
                resource's behavior.
         """
 
-        opts = ResourceOptions(id=id) if opts is None else opts.merge(ResourceOptions(id=id))
+        opts = ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
         return CustomResource(resource_name=resource_name, api_version=api_version, kind=kind, opts=opts)
 
     def translate_output_property(self, prop: str) -> str: