Merge pull request #66 from django/django1.6

Upgraded to Django 1.6.

blog/models.py

@@ -20,7 +20,7 @@ def published(self):
         return self.active().filter(pub_date__lte=datetime.datetime.now())
 
     def active(self):
-        return super(EntryManager, self).get_query_set().filter(is_active=True)
+        return super(EntryManager, self).get_queryset().filter(is_active=True)
 
 CONTENT_FORMAT_CHOICES = (
     (u'reST', u'reStructuredText'),

deploy-requirements.txt

@@ -1,7 +1,7 @@
 # Requirements to deploy this code.
 
 akismet == 0.2.0
-Django == 1.5.4
+Django == 1.6.1
 django-contact-form == 1.0
 django-haystack == 1.2.7
 django-push == 0.6

django_www/urls.py

@@ -33,7 +33,7 @@
     url(r'^conduct/enforcement-manual/$', TemplateView.as_view(template_name='conduct/enforcement.html'), name='conduct_enforcement'),
     url(r'^conduct/changes/$', TemplateView.as_view(template_name='conduct/changes.html'), name='conduct_enforcement'),
     url(r'^contact/', include('contact.urls')),
-    url(r'^r/', include('django.conf.urls.shortcut')),
+    url(r'^r/(?P<content_type_id>\d+)/(?P<object_id>.*)/$', 'django.contrib.contenttypes.views.shortcut'),
 
     # There's no school like the old school.
     url(r'^~(?P<username>[\w-]+)/$', account_views.user_profile, name='user_profile'),

docs/models.py

@@ -46,7 +46,7 @@ class DocumentRelease(models.Model):
     scm = models.CharField(max_length=10, choices=SCM_CHOICES)
     scm_url = models.CharField(max_length=200)
     docs_subdir = models.CharField(max_length=200, blank=True)
-    is_default = models.BooleanField()
+    is_default = models.BooleanField(default=False)
 
     objects = DocumentReleaseManager()
 

templates/aggregator/index.html

@@ -1,5 +1,7 @@
 {% extends "base_community.html" %}
 
+{% load cycle from future %}
+
 {% block extrahead %}
 {{ block.super }}
 <style type="text/css">

templates/releases/download.html

@@ -1,5 +1,7 @@
 {% extends "base_2col.html" %}
 
+{% load cycle from future %}
+
 {% block sectionid %}download{% endblock %}
 
 {% block title %}Download{% endblock %}

tracdb/models.py

@@ -196,8 +196,8 @@ def __init__(self, repo_id):
         self.repo_id = repo_id
         super(SingleRepoRevisionManager, self).__init__()
 
-    def get_query_set(self):
-        qs = super(SingleRepoRevisionManager, self).get_query_set()
+    def get_queryset(self):
+        qs = super(SingleRepoRevisionManager, self).get_queryset()
         return qs.filter(repos=self.repo_id)
 
 SINGLE_REPO_ID = 1