Skip to content
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

Jump to bottom

Gae #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Gae #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8047ad
remove file and env configuration
abloch Apr 1, 2014
0914b12
add gae note to readme
abloch Apr 1, 2014
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ that we build at [Iron.io](http://www.iron.io) from Python.
* Service-agnostic
* Pip- and easy_install-installable
* Well documented
* google app engine compatible

## It Is Not

Expand Down
10 changes: 5 additions & 5 deletions iron_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ def __init__(self, name, version, product, host=None, project_id=None,
config["host"] = products[product]["host"]
config["api_version"] = products[product]["version"]

config = configFromFile(config,
#config = configFromFile(config,
os.path.expanduser("~/.iron.json"), product)
config = configFromEnv(config)
config = configFromEnv(config, product)
config = configFromFile(config, "iron.json", product)
config = configFromFile(config, config_file, product)
#config = configFromEnv(config)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you removed all the other config options?

#config = configFromEnv(config, product)
#config = configFromFile(config, "iron.json", product)
#config = configFromFile(config, config_file, product)
config = configFromArgs(config, host=host, project_id=project_id,
token=token, protocol=protocol, port=port,
api_version=api_version)
Expand Down