Removed redundancy in "if else" statements (#520)

Azure · Nov 10, 2018 · 5c38cf7 · 5c38cf7
1 parent e1258d2
commit 5c38cf7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/azure-storage-blob/azure/storage/blob/_encryption.py b/azure-storage-blob/azure/storage/blob/_encryption.py
@@ -123,8 +123,8 @@ def _decrypt_blob(require_encryption, key_encryption_key, key_resolver,
     except:
         if require_encryption:
             raise ValueError(_ERROR_DATA_NOT_ENCRYPTED)
-        else:
-            return content
+
+        return content
 
     if not (encryption_data.encryption_agent.encryption_algorithm == _EncryptionAlgorithm.AES_CBC_256):
         raise ValueError(_ERROR_UNSUPPORTED_ENCRYPTION_ALGORITHM)

diff --git a/azure-storage-blob/azure/storage/blob/baseblobservice.py b/azure-storage-blob/azure/storage/blob/baseblobservice.py
@@ -1976,11 +1976,11 @@ def get_blob_to_stream(
         if max_connections > 1:
             if sys.version_info >= (3,) and not stream.seekable():
                 raise ValueError(_ERROR_PARALLEL_NOT_SEEKABLE)
-            else:
-                try:
-                    stream.seek(stream.tell())
-                except (NotImplementedError, AttributeError):
-                    raise ValueError(_ERROR_PARALLEL_NOT_SEEKABLE)
+
+            try:
+                stream.seek(stream.tell())
+            except (NotImplementedError, AttributeError):
+                raise ValueError(_ERROR_PARALLEL_NOT_SEEKABLE)
 
         # The service only provides transactional MD5s for chunks under 4MB.
         # If validate_content is on, get only self.MAX_CHUNK_GET_SIZE for the first

diff --git a/azure-storage-queue/azure/storage/queue/_encryption.py b/azure-storage-queue/azure/storage/queue/_encryption.py
@@ -113,8 +113,8 @@ def _decrypt_queue_message(message, require_encryption, key_encryption_key, reso
         # or the user provided a json formatted message.
         if require_encryption:
             raise ValueError(_ERROR_MESSAGE_NOT_ENCRYPTED)
-        else:
-            return message
+
+        return message
     try:
         return _decrypt(decoded_data, encryption_data, key_encryption_key, resolver).decode('utf-8')
     except Exception:

diff --git a/samples/blob/encryption_usage.py b/samples/blob/encryption_usage.py
@@ -30,14 +30,14 @@ def __init__(self, kid):
     def wrap_key(self, key, algorithm='A256KW'):
         if algorithm == 'A256KW':
             return aes_key_wrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'A256KW':
             return aes_key_unwrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'A256KW'
@@ -73,8 +73,8 @@ def wrap_key(self, key, algorithm='RSA'):
                                                algorithm=SHA1(),
                                                label=None)
                                            )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'RSA':
@@ -84,8 +84,8 @@ def unwrap_key(self, key, algorithm):
                                                 algorithm=SHA1(),
                                                 label=None)
                                             )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'RSA'

diff --git a/samples/queue/encryption_usage.py b/samples/queue/encryption_usage.py
@@ -29,14 +29,14 @@ def __init__(self, kid):
     def wrap_key(self, key, algorithm='A256KW'):
         if algorithm == 'A256KW':
             return aes_key_wrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'A256KW':
             return aes_key_unwrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'A256KW'
@@ -72,8 +72,8 @@ def wrap_key(self, key, algorithm='RSA'):
                                                algorithm=SHA1(),
                                                label=None)
                                            )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'RSA':
@@ -83,8 +83,8 @@ def unwrap_key(self, key, algorithm):
                                                 algorithm=SHA1(),
                                                 label=None)
                                             )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'RSA'

diff --git a/tests/encryption_test_helper.py b/tests/encryption_test_helper.py
@@ -26,14 +26,14 @@ def __init__(self, kid='local:key1'):
     def wrap_key(self, key, algorithm='A256KW'):
         if algorithm == 'A256KW':
             return aes_key_wrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'A256KW':
             return aes_key_unwrap(self.kek, key, self.backend)
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'A256KW'
@@ -69,8 +69,8 @@ def wrap_key(self, key, algorithm='RSA'):
                                                algorithm=SHA1(),
                                                label=None)
                                            )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def unwrap_key(self, key, algorithm):
         if algorithm == 'RSA':
@@ -80,8 +80,8 @@ def unwrap_key(self, key, algorithm):
                                                 algorithm=SHA1(),
                                                 label=None)
                                             )
-        else:
-            raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
+
+        raise ValueError(_ERROR_UNKNOWN_KEY_WRAP_ALGORITHM)
 
     def get_key_wrap_algorithm(self):
         return 'RSA'