Skip to content

Commit

Permalink
Revert "Add interpolate argument to avoid resolving proxied values."
Browse files Browse the repository at this point in the history
This reverts commit 797101b.
  • Loading branch information
sergeyklay committed Aug 30, 2023
1 parent 56a7c69 commit 8159241
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/tips.rst
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ Proxy value
===========

Values that being with a ``$`` may be interpolated. Pass ``interpolate=True`` to
``environ.Env()`` to enable this feature (``True`` by default):
``environ.Env()`` to enable this feature:

.. code-block:: python
Expand Down
6 changes: 2 additions & 4 deletions environ/environ.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,11 @@ class Env:
VAR = re.compile(r'(?<!\\)\$\{?(?P<name>[A-Z_][0-9A-Z_]*)}?',
re.IGNORECASE)

def __init__(self, interpolate=True, **scheme):
def __init__(self, **scheme):
self._local = threading.local()
self.smart_cast = True
self.escape_proxy = False
self.prefix = ""
self.interpolate = interpolate
self.scheme = scheme

def __call__(self, var, cast=None, default=NOTSET, parse_default=False):
Expand Down Expand Up @@ -426,8 +425,7 @@ def _get_value(self, var_name, cast=None, default=NOTSET,
value = default

# Expand variables
if self.interpolate and isinstance(value, (bytes, str)) \
and var_name not in NOT_EXPANDED:
if isinstance(value, (bytes, str)) and var_name not in NOT_EXPANDED:
def repl(match_):
return self.get_value(
match_.group('name'), cast=cast, default=default,
Expand Down
4 changes: 0 additions & 4 deletions tests/test_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ def test_bool_true(self, value, variable):
def test_proxied_value(self):
assert self.env('PROXIED_VAR') == 'bar'

def test_not_interpolated_proxied_value(self):
env = Env(interpolate=False)
assert env('PROXIED_VAR') == '$STR_VAR'

def test_escaped_dollar_sign(self):
self.env.escape_proxy = True
assert self.env('ESCAPED_VAR') == '$baz'
Expand Down

0 comments on commit 8159241

Please sign in to comment.