{Pylint} Fix used-before-assignment in Storage (Azure#30362)

* testpylint * fix used-before-assignment * fix merge removal * avoid changing original code logic
xaliciayang · Nov 28, 2024 · e98a4a2 · e98a4a2
1 parent 9ef9f30
commit e98a4a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/storage/_validators.py b/src/azure-cli/azure/cli/command_modules/storage/_validators.py
@@ -617,6 +617,7 @@ def validator(cmd, namespace):
         clear_content_settings = ns.pop('clear_content_settings', False)
 
         # retrieve the existing object properties for an update
+        props = None
         if update and not clear_content_settings:
             account = ns.get('account_name')
             key = ns.get('account_key')
@@ -677,7 +678,7 @@ def validator(cmd, namespace):
                 for attr in ['content_type', 'content_disposition', 'content_encoding', 'content_language',
                              'content_md5', 'cache_control']:
                     if getattr(new_props, attr) is None:
-                        setattr(new_props, attr, getattr(props, attr))  # pylint: disable=used-before-assignment
+                        setattr(new_props, attr, getattr(props, attr))
         else:
             if guess_from_file:
                 new_props = guess_content_type(ns[guess_from_file], new_props, settings_class)

diff --git a/src/azure-cli/azure/cli/command_modules/storage/_validators_azure_stack.py b/src/azure-cli/azure/cli/command_modules/storage/_validators_azure_stack.py
@@ -404,6 +404,7 @@ def validator(cmd, namespace):
         clear_content_settings = ns.pop('clear_content_settings', False)
 
         # retrieve the existing object properties for an update
+        props = None
         if update and not clear_content_settings:
             account = ns.get('account_name')
             key = ns.get('account_key')
@@ -443,7 +444,7 @@ def validator(cmd, namespace):
                 for attr in ['content_type', 'content_disposition', 'content_encoding', 'content_language',
                              'content_md5', 'cache_control']:
                     if getattr(new_props, attr) is None:
-                        setattr(new_props, attr, getattr(props, attr))  # pylint: disable=used-before-assignment
+                        setattr(new_props, attr, getattr(props, attr))
         else:
             if guess_from_file:
                 new_props = guess_content_type(ns[guess_from_file], new_props, settings_class)