Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
fixes bug 1215741 - Resolve all RemovedInDjango18Warning warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
peterbe committed Oct 22, 2015
1 parent 6a6d6d5 commit bf7c8ca
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
6 changes: 3 additions & 3 deletions airmozilla/main/models.py
Expand Up @@ -252,10 +252,10 @@ def get_queryset(self):
return ApprovableQuerySet(self.model, using=self._db)

def scheduled(self):
return self.get_query_set().filter(status=Event.STATUS_SCHEDULED)
return self.get_queryset().filter(status=Event.STATUS_SCHEDULED)

def scheduled_or_processing(self):
return self.get_query_set().filter(
return self.get_queryset().filter(
Q(status=Event.STATUS_SCHEDULED) |
Q(status=Event.STATUS_PROCESSING)
)
Expand All @@ -273,7 +273,7 @@ def upcoming(self):
)

def live(self):
return self.get_query_set().filter(
return self.get_queryset().filter(
status=Event.STATUS_SCHEDULED,
archive_time=None,
start_time__lt=_get_live_time()
Expand Down
17 changes: 0 additions & 17 deletions airmozilla/settings/base.py
@@ -1,7 +1,6 @@
# This is your project's main settings file that can be committed to your
# repo. If you need to override a setting locally, use settings/local.py
import os
import logging


ROOT = os.path.abspath(
Expand Down Expand Up @@ -171,22 +170,6 @@ def path(*dirs):
# Always generate a CSRF token for anonymous users.
ANON_ALWAYS = True

LOG_LEVEL = logging.INFO

HAS_SYSLOG = True # XXX needed??

LOGGING_CONFIG = None

# This disables all mail_admins on all django.request errors.
# We can do this because we use Sentry now instead
LOGGING = {
'loggers': {
'django.request': {
'handlers': []
}
}
}


def JINJA_CONFIG():
config = {
Expand Down
1 change: 1 addition & 0 deletions manage.py
Expand Up @@ -2,6 +2,7 @@
import os
import sys


if __name__ == '__main__':
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'airmozilla.settings')

Expand Down

0 comments on commit bf7c8ca

Please sign in to comment.