fixed linter error

roymanigley · roymanigley · commit 8badbfdfeb11 · 2025-03-25T21:46:37.000+01:00
diff --git a/src/dotenv/crypt.py b/src/dotenv/crypt.py
@@ -1,5 +1,6 @@
 import base64
 import re
+from typing import Optional
 
 from cryptography.fernet import Fernet
 
@@ -9,24 +10,30 @@
 class Crypt:
 
     @classmethod
-    def is_encrypted_value(cls, value) -> bool:
-        return not not re.match(ENCRYPTION_REGEX, value)
+    def is_encrypted_value(cls, value: Optional[str]) -> bool:
+        return value is not None and not not re.match(ENCRYPTION_REGEX, value)
 
     @classmethod
-    def _extract_encrypted_value(cls, value) -> str:
-        return re.match(ENCRYPTION_REGEX, value).group(1)
+    def _extract_encrypted_value(cls, value) -> Optional[str]:
+        match = re.match(ENCRYPTION_REGEX, value)
+        if match:
+            return match.group(1)
+        return None
 
     @classmethod
     def generate_key(cls) -> str:
         key_bytes = Fernet.generate_key()
         return base64.encodebytes(key_bytes).decode('utf-8')
 
     @classmethod
-    def decrypt_value(cls, value: str, key: str) -> str:
-        if not key:
+    def decrypt_value(cls, value: str, key: Optional[str]) -> str:
+        if not key or not value:
             return value
         key_bytes = base64.decodebytes(key.encode('utf-8'))
-        value_bytes = base64.decodebytes(cls._extract_encrypted_value(value).encode('utf-8'))
+        encrypted_value = cls._extract_encrypted_value(value)
+        if not encrypted_value:
+            return value
+        value_bytes = base64.decodebytes(encrypted_value.encode('utf-8'))
         decrypted_bytes = Fernet(key=key_bytes).decrypt(value_bytes)
         return decrypted_bytes.decode('utf-8')
 
@@ -35,13 +42,3 @@ def encrypt_value(cls, value: str, key: str) -> str:
         key_bytes = base64.decodebytes(key.encode('utf-8'))
         encrypted_bytes = Fernet(key=key_bytes).encrypt(value.encode('utf-8'))
         return 'enc{' + base64.encodebytes(encrypted_bytes).decode('utf-8').strip().replace('\n', '') + '}'
-
-
-if __name__ == '__main__':
-    key = Crypt.generate_key()
-    message = 'Hello World'
-    encrypt_value = Crypt.encrypt_value(message, key)
-    print(encrypt_value)
-    print(Crypt.is_encrypted_value(encrypt_value))
-    print(Crypt._extract_encrypted_value(encrypt_value))
-    print(Crypt.decrypt_value(encrypt_value, key))
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
@@ -40,7 +40,7 @@ def __init__(
         encoding: Optional[str] = None,
         interpolate: bool = True,
         override: bool = True,
-        secret_key: str = None
+        secret_key: Optional[str] = None
     ) -> None:
         self.dotenv_path: Optional[StrPath] = dotenv_path
         self.stream: Optional[IO[str]] = stream
@@ -158,7 +158,7 @@ def set_key(
     quote_mode: str = "always",
     export: bool = False,
     encoding: Optional[str] = "utf-8",
-    secret_key: str = None,
+    secret_key: Optional[str] = None,
 ) -> Tuple[Optional[bool], str, str]:
     """
     Adds or Updates a key/value to the given .env
@@ -205,7 +205,7 @@ def unset_key(
     key_to_unset: str,
     quote_mode: str = "always",
     encoding: Optional[str] = "utf-8",
-    secret_key: str = None
+    secret_key: Optional[str] = None
 ) -> Tuple[Optional[bool], str]:
     """
     Removes a given key from the given `.env` file.
diff --git a/src/dotenv/parser.py b/src/dotenv/parser.py
@@ -120,7 +120,7 @@ def parse_unquoted_value(reader: Reader) -> str:
     return re.sub(r"\s+#.*", "", part).rstrip()
 
 
-def parse_value(reader: Reader, secret_key: str) -> str:
+def parse_value(reader: Reader, secret_key: Optional[str]) -> str:
     char = reader.peek(1)
     if char == u"'":
         (value,) = reader.read_regex(_single_quoted_value)
@@ -138,7 +138,7 @@ def parse_value(reader: Reader, secret_key: str) -> str:
     return value
 
 
-def parse_binding(reader: Reader, secret_key: str = None) -> Binding:
+def parse_binding(reader: Reader, secret_key: Optional[str] = None) -> Binding:
     reader.set_mark()
     try:
         reader.read_regex(_multiline_whitespace)
@@ -174,13 +174,12 @@ def parse_binding(reader: Reader, secret_key: str = None) -> Binding:
             error=True,
         )
 
-def parse_secret_value(value: str) -> str:
 
+def parse_secret_value(value: str) -> str:
     return value
 
 
-
-def parse_stream(stream: IO[str], secret_key: str = None) -> Iterator[Binding]:
+def parse_stream(stream: IO[str], secret_key: Optional[str] = None) -> Iterator[Binding]:
     reader = Reader(stream)
     while reader.has_next():
         yield parse_binding(reader, secret_key)
