Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #66 from django/django1.6

Upgraded to Django 1.6.
  • Loading branch information...
commit 89c87775d2cfb74cfc1d96084e15b541edf9b0e1 2 parents e610d7b + 9b3b2da
Aymeric Augustin aaugustin authored
2  blog/models.py
View
@@ -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'),
2  deploy-requirements.txt
View
@@ -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
2  django_www/urls.py
View
@@ -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'),
2  docs/models.py
View
@@ -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()
2  templates/aggregator/index.html
View
@@ -1,5 +1,7 @@
{% extends "base_community.html" %}
+{% load cycle from future %}
+
{% block extrahead %}
{{ block.super }}
<style type="text/css">
2  templates/releases/download.html
View
@@ -1,5 +1,7 @@
{% extends "base_2col.html" %}
+{% load cycle from future %}
+
{% block sectionid %}download{% endblock %}
{% block title %}Download{% endblock %}
4 tracdb/models.py
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.