summaryrefslogtreecommitdiff
path: root/opendc/models/room_state.py
diff options
context:
space:
mode:
Diffstat (limited to 'opendc/models/room_state.py')
-rw-r--r--opendc/models/room_state.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/opendc/models/room_state.py b/opendc/models/room_state.py
index 2404d86b..4326a32b 100644
--- a/opendc/models/room_state.py
+++ b/opendc/models/room_state.py
@@ -3,23 +3,13 @@ from opendc.util import database
class RoomState(Model):
- JSON_TO_PYTHON_DICT = {
- 'RoomState': {
- 'roomId': 'room_id',
- 'loadFraction': 'load_fraction',
- 'tick': 'tick'
- }
- }
+ JSON_TO_PYTHON_DICT = {'RoomState': {'roomId': 'room_id', 'loadFraction': 'load_fraction', 'tick': 'tick'}}
@classmethod
def _from_database_row(cls, row):
"""Instantiate a RoomState from a database row."""
- return cls(
- room_id=row[0],
- load_fraction=row[1],
- tick=row[2]
- )
+ return cls(room_id=row[0], load_fraction=row[1], tick=row[2])
@classmethod
def from_experiment_id(cls, experiment_id):
@@ -39,7 +29,7 @@ class RoomState(Model):
AND machine_states.experiment_id = %s
GROUP BY machine_states.tick, rooms.id
'''
- results = database.fetch_all(statement, (experiment_id,))
+ results = database.fetch_all(statement, (experiment_id, ))
for row in results:
room_states.append(cls._from_database_row(row))