Skip to content

Commit

Permalink
Merge pull request #26 from danielecook/master
Browse files Browse the repository at this point in the history
Fix for use on google app engine
  • Loading branch information
ulandj committed Feb 29, 2016
2 parents 82788c4 + 8f1bf3a commit f09a160
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions iron_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,12 @@ def __init__(self, name, version, product, host=None, project_id=None,
if product in products:
config["host"] = products[product]["host"]
config["api_version"] = products[product]["version"]

config = configFromFile(config,
os.path.expanduser("~/.iron.json"), product)

try:
config = configFromFile(config,
os.path.expanduser("~/.iron.json"), product)
except:
pass
config = configFromEnv(config)
config = configFromEnv(config, product)
config = configFromFile(config, "iron.json", product)
Expand Down

0 comments on commit f09a160

Please sign in to comment.