# HG changeset patch # User Dennis Fink # Date 2016-03-14 21:15:05 # Node ID 3b479be37a7312d925d82749d4c46e952b965156 # Parent 089786179d4107140fdc9fcb35b9533ac965b813 Update diff --git a/client.py b/client.py --- a/client.py +++ b/client.py @@ -4,16 +4,16 @@ import time from requests.auth import HTTPDigestAuth -base_url = 'http://localhost:5000' -auth = HTTPDigestAuth('test', 'test') +base_url = 'http://spaceapi.c3l.lu' +auth = HTTPDigestAuth('spaceapi', 'eiCh8bee') # print("Testing setting state to closed") -# payload = {"value": False} -# r = requests.post(base_url + '/state/set/open', -# auth=auth, -# data=json.dumps(payload)) -# print(r.text) +payload = {"value": False} +r = requests.post(base_url + '/state/set/open', + auth=auth, + data=json.dumps(payload)) +print(r.text) # # time.sleep(1) # @@ -45,11 +45,11 @@ auth = HTTPDigestAuth('test', 'test') # data=json.dumps(payload)) # print(r.text) -print("Testing setting temperature") -payload = {"name": "Test", "location": "Test", "unit": "°C", "value": 24} -auth = HTTPDigestAuth('test', 'test') - -r = requests.post(base_url + '/sensors/set/temperature', - auth=auth, - data=json.dumps(payload)) -print(r.text) +# print("Testing setting temperature") +# payload = {"name": "Test", "location": "Test", "unit": "°C", "value": 24} +# auth = HTTPDigestAuth('test', 'test') +# +# r = requests.post(base_url + '/sensors/set/temperature', +# auth=auth, +# data=json.dumps(payload)) +# print(r.text) diff --git a/dev-requirements.txt b/dev-requirements.txt --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,13 +1,22 @@ -alabaster==0.7.4 -Babel==1.3 -docutils==0.12 -Jinja2==2.7.3 -MarkupSafe==0.23 -pip-tools==0.3.6 -Pygments==2.0.2 -pytz==2015.4 -six==1.9.0 -snowballstemmer==1.2.0 -sphinx-rtd-theme==0.1.8 -Sphinx==1.3.1 -wheel==0.24.0 +# +# This file is autogenerated by pip-compile +# Make changes in dev-requirements.in, then run this to update: +# +# pip-compile dev-requirements.in +# +alabaster==0.7.6 # via sphinx +babel==2.1.1 # via sphinx +click==6.2 # via pip-tools +docutils==0.12 # via sphinx +first==2.0.1 # via pip-tools +jinja2==2.8 # via sphinx +markupsafe==0.23 # via jinja2 +pip-tools==1.2.0 +pygments==2.0.2 # via sphinx +pytz==2015.7 # via babel +requests==2.8.1 +six==1.10.0 # via pip-tools, sphinx +snowballstemmer==1.2.0 # via sphinx +sphinx-rtd-theme==0.1.9 # via sphinx +sphinx==1.3.2 +wheel==0.26.0 diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1,20 @@ +# +# This file is autogenerated by pip-compile +# Make changes in requirements.in, then run this to update: +# +# pip-compile requirements.in +# +dominate==2.1.16 # via flask-bootstrap +flask-bootstrap==3.3.5.7 +flask-httpauth==2.7.0 +flask==0.10.1 +itsdangerous==0.24 # via flask +jinja2==2.8 # via flask +jsonschema==2.5.1 +markupsafe==0.23 # via jinja2 +oauthlib==1.0.3 # via requests-oauthlib +python-twitter==2.2 +requests-oauthlib==0.5.0 # via python-twitter +requests==2.8.1 # via python-twitter, requests-oauthlib +visitor==0.1.2 # via flask-bootstrap +werkzeug==0.11.2 # via flask diff --git a/spaceapi/state.py b/spaceapi/state.py --- a/spaceapi/state.py +++ b/spaceapi/state.py @@ -6,8 +6,6 @@ from flask import Blueprint, jsonify, re import twitter -import twitter - from .utils import ActiveStatus from .auth import httpauth @@ -18,8 +16,6 @@ ALLOWED_STATE_KEYS = frozenset(('open', twitter_api = twitter.Api() -twitter_api = twitter.Api() - @state_views.route('/set/', methods=['POST']) @httpauth.login_required @@ -49,19 +45,6 @@ def set_state(key): else: twitter_api.PostUpdate('The space is now closed!') - if 'twitter_consumer_key' in current_app.config: - twitter_api.SetCredentials( - consumer_key=current_app.config['twitter_consumer_key'], - consumer_secret=current_app.config['twitter_consumer_secret'], - access_token_key=current_app.config['twitter_access_token_key'], - access_token_secret=current_app.config['twitter_access_token_secret'] - ) - - if value: - twitter_api.PostUpdate('The space is now open!') - else: - twitter_api.PostUpdate('The space is now closed!') - active.save_last_state() return jsonify(active) else: