feat: add with_env param in dotenv_values

Author: ramwin

src/dotenv/main.py

@@ -338,6 +338,7 @@ def dotenv_values(
     verbose: bool = False,
     interpolate: bool = True,
     encoding: Optional[str] = "utf-8",
+    with_env: bool = False,
 ) -> Dict[str, Optional[str]]:
     """
     Parse a .env file and return its content as a dict.
@@ -348,17 +349,25 @@ def dotenv_values(
       `False`.
       in `.env` file.  Defaults to `False`.
     - *encoding*: encoding to be used to read the file.
+    - *with_env*: include the os.environ() to response.
 
     If both `dotenv_path` and `stream`, `find_dotenv()` is used to find the .env file.
     """
     if dotenv_path is None and stream is None:
         dotenv_path = find_dotenv()
 
-    return DotEnv(
+    result = DotEnv(
         dotenv_path=dotenv_path,
         stream=stream,
         verbose=verbose,
         interpolate=interpolate,
         override=True,
         encoding=encoding,
     ).dict()
+    if with_env:
+        return dict(
+            **os.environ,
+            **result,
+        )
+    else:
+        return result

tests/test_main.py

@@ -384,3 +384,9 @@ def test_dotenv_values_file_stream(dotenv_file):
         result = dotenv.dotenv_values(stream=f)
 
     assert result == {"a": "b"}
+
+
+def test_dotenv_values_with_os_environment():
+    if os.environ.get("USER"):
+        assert "USER" not in dotenv.dotenv_values(with_env=False)
+        assert "USER" in dotenv.dotenv_values(with_env=True)