Skip to content

Fix to enable loading from current directory #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theskumar merged 4 commits into from
Jul 11, 2018
Merged

Fix to enable loading from current directory #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c45575b
Fix to enable loading from current directory
cjauvin Apr 27, 2018
a3bbecb
Add test to make sure loading from current dir works
cjauvin Apr 27, 2018
15c0435
Reorder test_core tests to avoid directory problem
cjauvin Apr 27, 2018
1df8b69
Reorder curr dir test again, and use os.chdir
cjauvin Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dotenv/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ def find_dotenv(filename='.env', raise_error_if_not_found=False, usecwd=False):
path = os.getcwd()
else:
# will work for .py files
frame_filename = sys._getframe().f_back.f_code.co_filename
frame = sys._getframe()
# find first frame that is outside of this file
while frame.f_code.co_filename == __file__:
frame = frame.f_back
frame_filename = frame.f_code.co_filename
path = os.path.dirname(os.path.abspath(frame_filename))

for dirname in _walk_to_root(path):
Expand Down
15 changes: 14 additions & 1 deletion tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf8 -*-
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

import os
Expand Down Expand Up @@ -107,6 +107,19 @@ def test_load_dotenv_override(cli):
sh.rm(dotenv_path)


def test_load_dotenv_in_current_dir():
# make sure were are here!
os.chdir(os.path.dirname(os.path.realpath(__file__)))
dotenv_path = '.env'
with open(dotenv_path, 'w') as f:
f.write("TOTO=bla\n")
assert 'TOTO' not in os.environ
success = load_dotenv(verbose=True)
assert success
assert os.environ['TOTO'] == 'bla'
sh.rm(dotenv_path)


def test_ipython():
tmpdir = os.path.realpath(tempfile.mkdtemp())
os.chdir(tmpdir)
Expand Down