Fix expiry calculations

create_new_stock.py

@@ -1,5 +1,4 @@
-from datetime import timedelta
-from time import strptime
+from datetime import timedelta, datetime
 
 import model
 from model import cleanup
@@ -7,7 +6,7 @@ from model import cleanup
 if __name__ == '__main__':
     timeout = float(input('How long will the initial selling be available? (minutes):'))
     try:
-        expiry = strptime(model.current_db_time(), '%Y-%m-%d %H:%M:%S') + timedelta(minutes=timeout)
+        expiry = datetime.strptime(model.current_db_time(), '%Y-%m-%d %H:%M:%S') + timedelta(minutes=timeout)
         print(model.new_stock(expiry))
         cleanup()
     except OverflowError:

model.py

@@ -3,7 +3,6 @@ import re
 import sqlite3 as db
 import sys
 import uuid
-from datetime import timedelta, datetime
 from math import floor
 
 from passlib.handlers.sha2_crypt import sha256_crypt

server_controller.py

@@ -1,6 +1,5 @@
 import json
-from datetime import timedelta
-from time import strptime
+from datetime import timedelta, datetime
 
 from bottle import request, response
 import model
@@ -136,7 +135,8 @@ def order():
         if not model.user_owns_at_least(amount, user_id, ownable_id):
             return bad_request('You can not sell more than you own.')
     try:
-        expiry = strptime(model.current_db_time(), '%Y-%m-%d %H:%M:%S') + timedelta(minutes=time_until_expiration)
+        expiry = datetime.strptime(model.current_db_time(), '%Y-%m-%d %H:%M:%S') + \
+                 timedelta(minutes=time_until_expiration)
     except OverflowError:
         return bad_request('The expiration time is too far in the future.')
     model.place_order(buy, ownership_id, limit, stop_loss, amount, expiry)