diff --git a/symposion/boxes/urls.py b/symposion/boxes/urls.py index c0cf3fb13332e8fe37ce7f050d3e8b55e2f15acd..993ec13603c4d1ee00bc835b61306397412b6d1f 100644 --- a/symposion/boxes/urls.py +++ b/symposion/boxes/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns urlpatterns = patterns("symposion.boxes.views", diff --git a/symposion/cms/urls.py b/symposion/cms/urls.py index be16e2cd40d37fd1850535ee015130f0e986fdf4..74064edbaca3567f7abe65d1dcec721f6a48988c 100644 --- a/symposion/cms/urls.py +++ b/symposion/cms/urls.py @@ -1,5 +1,5 @@ -# flake8: noqa -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns + PAGE_RE = r"(([\w-]{1,})(/[\w-]{1,})*)/" diff --git a/symposion/conference/urls.py b/symposion/conference/urls.py index f2cdd52b55e521b4729dc41a0f16f7befb6de4b0..90ae79f852d53cc4e329aa576be3fd9f7e6881b0 100644 --- a/symposion/conference/urls.py +++ b/symposion/conference/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns("symposion.conference.views", diff --git a/symposion/proposals/models.py b/symposion/proposals/models.py index c12c5bcc768ca32c43c075da355f6ddd3af18e4c..699f70b6e2fa801290638a161eba1d05f533cc1d 100644 --- a/symposion/proposals/models.py +++ b/symposion/proposals/models.py @@ -1,4 +1,3 @@ -import datetime import os import uuid @@ -6,6 +5,7 @@ from django.core.urlresolvers import reverse from django.db import models from django.db.models import Q from django.utils.translation import ugettext_lazy as _ +from django.utils.timezone import now from django.contrib.auth.models import User @@ -37,20 +37,18 @@ class ProposalSection(models.Model): @classmethod def available(cls): - now = datetime.datetime.now() return cls._default_manager.filter( - Q(start__lt=now) | Q(start=None), - Q(end__gt=now) | Q(end=None), + Q(start__lt=now()) | Q(start=None), + Q(end__gt=now()) | Q(end=None), Q(closed=False) | Q(closed=None), ) def is_available(self): if self.closed: return False - now = datetime.datetime.now() - if self.start and self.start > now: + if self.start and self.start > now(): return False - if self.end and self.end < now: + if self.end and self.end < now(): return False return True @@ -102,7 +100,7 @@ class ProposalBase(models.Model): "target='_blank'>Markdown.") ) submitted = models.DateTimeField( - default=datetime.datetime.now, + default=now, editable=False, ) speaker = models.ForeignKey("speakers.Speaker", related_name="proposals") @@ -175,7 +173,8 @@ class SupportingDocument(models.Model): proposal = models.ForeignKey(ProposalBase, related_name="supporting_documents") uploaded_by = models.ForeignKey(User) - created_at = models.DateTimeField(default=datetime.datetime.now) + + created_at = models.DateTimeField(default=now) file = models.FileField(upload_to=uuid_filename) description = models.CharField(max_length=140) diff --git a/symposion/proposals/urls.py b/symposion/proposals/urls.py index c2efdcb538aa9ce1bbe5a1f15afd13c09ff4ed56..a69e61366e70c7121ccef40424ae5d2407aeb644 100644 --- a/symposion/proposals/urls.py +++ b/symposion/proposals/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url urlpatterns = patterns("symposion.proposals.views", diff --git a/symposion/proposals/views.py b/symposion/proposals/views.py index b3a3edfe0dbdcd10be52f0bb94076e3ba6b1fdc0..570e988b61ca5d6271b1a781f59fdce9f3ff086a 100644 --- a/symposion/proposals/views.py +++ b/symposion/proposals/views.py @@ -7,7 +7,12 @@ from django.core.urlresolvers import reverse from django.db.models import Q from django.http import Http404, HttpResponse, HttpResponseForbidden from django.shortcuts import render, redirect, get_object_or_404 -from django.utils.hashcompat import sha_constructor + +try: + from hashlib import sha1 as sha_constructor +except ImportError: + from django.utils.hashcompat import sha_constructor + from django.views import static from django.contrib import messages diff --git a/symposion/reviews/urls.py b/symposion/reviews/urls.py index 3cdc6f737580b55487f228a4162e8ef597a7957c..1719eb0e8dff7f3384b1953d22aefadf0420131b 100644 --- a/symposion/reviews/urls.py +++ b/symposion/reviews/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns("symposion.reviews.views", diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py index a47afb9d909a3f4d169a76f6ac7ca1c188b3d7b6..5954e07e861501611a4864a09557addbfd6f45a8 100644 --- a/symposion/schedule/models.py +++ b/symposion/schedule/models.py @@ -80,8 +80,9 @@ class Slot(models.Model): Unassign the associated content with this slot. """ if self.content and self.content.slot_id: - self.content.slot = None - self.content.save() + presentation = self.content + presentation.slot = None + presentation.save() @property def content(self): diff --git a/symposion/schedule/urls.py b/symposion/schedule/urls.py index 94acd3e1baf456be7e67e0a9788ec8df6e15e951..b6cd16303a4823d6b511b0973ab38ce8c432804f 100644 --- a/symposion/schedule/urls.py +++ b/symposion/schedule/urls.py @@ -1,5 +1,5 @@ -# flake8: noqa -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns + urlpatterns = patterns("symposion.schedule.views", url(r"^$", "schedule_conference", name="schedule_conference"), diff --git a/symposion/speakers/urls.py b/symposion/speakers/urls.py index 0d1c7b1304d9958c3a24d8ba2632e99ea8c32f16..fb30e7877ee714610f28b0282dd9115c8cff28ba 100644 --- a/symposion/speakers/urls.py +++ b/symposion/speakers/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url urlpatterns = patterns("symposion.speakers.views", diff --git a/symposion/sponsorship/urls.py b/symposion/sponsorship/urls.py index e6ba5fa3e99377b39d36133a41ad1ad0c31b822b..c7dc581cb154012efc1817825c509c45b64bb614 100644 --- a/symposion/sponsorship/urls.py +++ b/symposion/sponsorship/urls.py @@ -1,10 +1,9 @@ -# flake8: noqa -from django.conf.urls.defaults import patterns, url -from django.views.generic.simple import direct_to_template +from django.conf.urls import patterns, url +from django.views.generic import TemplateView urlpatterns = patterns("symposion.sponsorship.views", - url(r"^$", direct_to_template, {"template": "sponsorship/list.html"}, name="sponsor_list"), + url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), name="sponsor_list"), url(r"^apply/$", "sponsor_apply", name="sponsor_apply"), url(r"^add/$", "sponsor_add", name="sponsor_add"), url(r"^(?P\d+)/$", "sponsor_detail", name="sponsor_detail"), diff --git a/symposion/teams/urls.py b/symposion/teams/urls.py index d70a600d40aadb5b83e4ded873f2fdb5534ba8f3..785c43007c440d18f0fdf914a1ba270fb0e176ed 100644 --- a/symposion/teams/urls.py +++ b/symposion/teams/urls.py @@ -1,5 +1,4 @@ -# flake8: noqa -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url urlpatterns = patterns("symposion.teams.views",