Skip to content

Commit 665cfd5

Browse files
Merge pull request #61 from liam-middlebrook/utc-time
utcnow -> now
2 parents 5a7a356 + 837f12f commit 665cfd5

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

conditional/blueprints/attendance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def display_attendance_cm():
146146
return render_template(request,
147147
'attendance_cm.html',
148148
username=user_name,
149-
date=datetime.utcnow().strftime("%Y-%m-%d"))
149+
date=datetime.now().strftime("%Y-%m-%d"))
150150

151151

152152
@attendance_bp.route('/attendance_ts')
@@ -162,7 +162,7 @@ def display_attendance_ts():
162162
return render_template(request,
163163
'attendance_ts.html',
164164
username=user_name,
165-
date=datetime.utcnow().strftime("%Y-%m-%d"))
165+
date=datetime.now().strftime("%Y-%m-%d"))
166166

167167

168168
@attendance_bp.route('/attendance_hm')
@@ -178,7 +178,7 @@ def display_attendance_hm():
178178
return render_template(request,
179179
'attendance_hm.html',
180180
username=user_name,
181-
date=datetime.utcnow().strftime("%Y-%m-%d"),
181+
date=datetime.now().strftime("%Y-%m-%d"),
182182
members=get_non_alumni_non_coop(internal=True))
183183

184184

conditional/blueprints/slideshow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def slideshow_intro_display():
3737
return render_template(request,
3838
'intro_eval_slideshow.html',
3939
username=user_name,
40-
date=datetime.utcnow().strftime("%Y-%m-%d"),
40+
date=datetime.now().strftime("%Y-%m-%d"),
4141
members=display_intro_evals(internal=True))
4242

4343

@@ -96,7 +96,7 @@ def slideshow_spring_display():
9696
return render_template(request,
9797
'spring_eval_slideshow.html',
9898
username=user_name,
99-
date=datetime.utcnow().strftime("%Y-%m-%d"),
99+
date=datetime.now().strftime("%Y-%m-%d"),
100100
members=display_spring_evals(internal=True))
101101

102102

conditional/models/migrate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def migrate_models():
307307
from datetime import datetime
308308
members = [m['uid'][0].decode('utf-8') for m in ldap.ldap_get_onfloor_members()]
309309
for m in members:
310-
db.session.add(models.OnFloorStatusAssigned(m, datetime.utcnow()))
310+
db.session.add(models.OnFloorStatusAssigned(m, datetime.now()))
311311
print("END: ON FLOOR")
312312

313313
print("BEGIN: SPRING EVALS")

conditional/models/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def __init__(self, uid, description, due):
220220
self.uid = uid
221221
self.description = description
222222
self.date_due = due
223-
self.date_created = datetime.utcnow()
223+
self.date_created = datetime.now()
224224
self.status = "Pending"
225225
self.active = True
226226

0 commit comments

Comments
 (0)