diff --git a/.travis.yml b/.travis.yml index 313660f..873d54b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ sudo: false env: - TOX_ENV=py27-flake8 - TOX_ENV=py27 - - TOX_ENV=py33 - TOX_ENV=py34 - TOX_ENV=py35 diff --git a/dotenv.py b/dotenv.py index 48fd2b5..63be7e6 100644 --- a/dotenv.py +++ b/dotenv.py @@ -34,17 +34,17 @@ """, re.IGNORECASE | re.VERBOSE) -def read_dotenv(dotenv=None, overwrite=False): +def read_dotenv(dotenv=None, override=False): """ Read a .env file into os.environ. If not given a path to a dotenv path, does filthy magic stack backtracking to find manage.py and then find the dotenv. - If tests rely on .env files, setting the overwrite flag to True is a safe way to ensure tests run consistently - across all environments. + If tests rely on .env files, setting the overwrite flag to True is a safe + way to ensure tests run consistently across all environments. - :param overwrite: True if values in .env should overwrite export environment variables. + :param override: True if values in .env should override system variables. """ if dotenv is None: frame_filename = sys._getframe().f_back.f_code.co_filename @@ -56,7 +56,7 @@ def read_dotenv(dotenv=None, overwrite=False): if os.path.exists(dotenv): with open(dotenv) as f: for k, v in parse_dotenv(f.read()).items(): - if overwrite: + if override: os.environ[k] = v else: os.environ.setdefault(k, v)