Skip to content

Commit 0f1b937

Browse files
committed
models: Don't use != None for date/time values
Dates and times are "true" when used as booleans; None is "false". So, these values can be used directly.
1 parent 18d9ce9 commit 0f1b937

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

naucse/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def __str__(self):
305305
date = DataProperty(info, default=None)
306306

307307
def _time(self, key, default_time):
308-
if self.date != None and default_time != None:
308+
if self.date and default_time:
309309
return datetime.datetime.combine(self.date, default_time)
310310
return None
311311

naucse/routes.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,12 @@ def course_calendar_ics(course):
334334
abort(404)
335335
calendar = ics.Calendar()
336336
for session in course.sessions.values():
337-
if session.start_time == None:
338-
start_time = datetime.datetime.combine(session.date, datetime.time())
339-
end_time = None
340-
else:
337+
if session.start_time:
341338
start_time = session.start_time
342339
end_time = session.end_time
340+
else:
341+
start_time = datetime.datetime.combine(session.date, datetime.time())
342+
end_time = None
343343
cal_event = ics.Event(
344344
name = session.title,
345345
begin = start_time,

naucse/templates/course.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h4>
5757
<div class="calendar-dates">
5858
{{ (course.start_date, course.end_date) | format_date_range }}
5959
</div>
60-
{% if course.default_start_time != None %}
60+
{% if course.default_start_time %}
6161
<div class="default-times">
6262
{{ course.default_start_time }}
6363

0 commit comments

Comments
 (0)