Skip to content

Commit

Permalink
Merge pull request apache#472 from jlowin/revert-467-fix_env_var
Browse files Browse the repository at this point in the history
Revert "Fix issue with expand_env_var"
  • Loading branch information
mistercrunch committed Sep 30, 2015
2 parents 889f5b9 + 4bbbee1 commit c347c3a
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions airflow/configuration.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from future import standard_library
standard_library.install_aliases()
from past.builtins import basestring
from builtins import str
from configparser import ConfigParser
import errno
Expand Down Expand Up @@ -30,8 +29,6 @@ def expand_env_var(env_var):
`expandvars` and `expanduser` until interpolation stops having
any effect.
"""
if not isinstance(env_var, basestring):
return env_var
while True:
interpolated = os.path.expanduser(os.path.expandvars(str(env_var)))
if interpolated == env_var:
Expand Down

0 comments on commit c347c3a

Please sign in to comment.