Eren Yilmaz пре 5 година
родитељ
комит
c24422fbc4
8 измењених фајлова са 9 додато и 16 уклоњено
  1. 1 2
      create_new_stock.py
  2. 1 2
      delete_ownable.py
  3. 1 2
      delete_user.py
  4. 1 2
      drop_old_sessions.py
  5. 1 2
      hash_all_users_passwords.py
  6. 1 2
      publish_news_item.py
  7. 1 2
      reset_bank.py
  8. 2 2
      run_db_setup.py

+ 1 - 2
create_new_stock.py

@@ -1,13 +1,12 @@
 from datetime import timedelta, datetime
 
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     timeout = float(input('How long will the initial selling be available? (minutes):'))
     try:
         expiry = datetime.strptime(model.current_db_time(), '%Y-%m-%d %H:%M:%S') + timedelta(minutes=timeout)
         print(model.new_stock(expiry))
-        cleanup()
+        model.cleanup()
     except OverflowError:
         print('The expiration time is too far in the future.')

+ 1 - 2
delete_ownable.py

@@ -1,5 +1,4 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     ownable_id = model.ownable_id_by_name(input('Which ownable?'))
@@ -8,4 +7,4 @@ if __name__ == '__main__':
         model.delete_ownable(ownable_id=ownable_id)
     else:
         print('Not deleting ownable')
-    cleanup()
+    model.cleanup()

+ 1 - 2
delete_user.py

@@ -1,5 +1,4 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     user_id = model.get_user_id_by_name(input('Which user?'))
@@ -8,4 +7,4 @@ if __name__ == '__main__':
         model.delete_user(user_id=user_id)
     else:
         print('Not deleting user')
-    cleanup()
+    model.cleanup()

+ 1 - 2
drop_old_sessions.py

@@ -1,6 +1,5 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     model.drop_old_sessions()
-    cleanup()
+    model.cleanup()

+ 1 - 2
hash_all_users_passwords.py

@@ -1,7 +1,6 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     if input('Are you sure you want to hash all users passwords? (type in "yes" or something else):') == 'yes':
         model.hash_all_users_passwords()
-        cleanup()
+        model.cleanup()

+ 1 - 2
publish_news_item.py

@@ -1,6 +1,5 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     print(model.new_news(input('Message of the news:')))
-    cleanup()
+    model.cleanup()

+ 1 - 2
reset_bank.py

@@ -1,9 +1,8 @@
 import model
-from model import cleanup
 
 if __name__ == '__main__':
     if input('Are you sure you want to remove all the banks ownerships? (type in "yes" or something else):') == 'yes':
         model.reset_bank()
     else:
         print('Not resetting bank.')
-    cleanup()
+    model.cleanup()

+ 2 - 2
run_db_setup.py

@@ -1,4 +1,4 @@
-from model import setup
+import model
 
 if __name__ == '__main__':
-    setup()
+    model.setup()