Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop' of github.com:divio/django-cms into release-2.3.3

  • Loading branch information...
commit 7147e1a0ccee28ade7dc05b1c19324f2379e10eb 2 parents ddea09b + a323e28
@ojii ojii authored
View
1  .travis.yml
@@ -1,5 +1,6 @@
language: python
python:
+ - "2.5"
- "2.6"
- "2.7"
env:
View
1  cms/middleware/multilingual.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+from __future__ import with_statement
from cms.test_utils.util.context_managers import SettingsOverride
from cms.utils.i18n import get_default_language
from django.conf import settings
View
8 cms/models/placeholdermodel.py
@@ -126,8 +126,7 @@ def _get_attached_models(self):
"""
return [field.model for field in self._get_attached_fields()]
- @property
- def page(self):
+ def page_getter(self):
if not hasattr(self, '_page'):
from cms.models.pagemodel import Page
try:
@@ -136,10 +135,11 @@ def page(self):
self._page = None
return self._page
- @page.setter
- def page(self, value):
+ def page_setter(self, value):
self._page = value
+ page = property(page_getter, page_setter)
+
def get_plugins_list(self):
return list(self.get_plugins())
View
11 cms/sitemaps/cms_sitemap.py
@@ -1,6 +1,13 @@
# -*- coding: utf-8 -*-
from django.contrib.sitemaps import Sitemap
-import itertools
+
+def from_iterable(iterables):
+ """
+ Backport of itertools.chain.from_iterable
+ """
+ for it in iterables:
+ for element in it:
+ yield element
class CMSSitemap(Sitemap):
changefreq = "monthly"
@@ -15,7 +22,7 @@ def items(self):
def lastmod(self, page):
modification_dates = [page.changed_date, page.publication_date]
plugins_for_placeholder = lambda placeholder: placeholder.cmsplugin_set.all()
- plugins = itertools.chain.from_iterable(map(plugins_for_placeholder, page.placeholders.all()))
+ plugins = from_iterable(map(plugins_for_placeholder, page.placeholders.all()))
plugin_modification_dates = map(lambda plugin: plugin.changed_date, plugins)
modification_dates.extend(plugin_modification_dates)
return max(modification_dates)
View
16 docs/index.rst
@@ -9,6 +9,20 @@ Welcome to django CMS's documentation!
This document refers to version |release|
+*******
+Install
+*******
+
+.. toctree::
+ :maxdepth: 1
+
+ getting_started/installation
+ upgrade/2.3.3
+ upgrade/2.3.2
+ upgrade/2.3
+ upgrade/2.2
+ upgrade/2.1
+
***************
Getting Started
***************
@@ -17,8 +31,6 @@ Getting Started
:maxdepth: 2
:numbered:
- getting_started/installation
- upgrade/index
getting_started/tutorial
getting_started/using_south
getting_started/configuration
View
2  docs/upgrade/2.3.2.rst
@@ -7,7 +7,7 @@ What's new in 2.3.2
*******************
Google map plugin
-===================
+=================
Google map plugin now supports width and height fields so that plugin size
can be modified in the page admin or frontend editor.
View
19 docs/upgrade/2.3.3.rst
@@ -0,0 +1,19 @@
+###################
+2.3.3 release notes
+###################
+
+*******************
+What's new in 2.3.3
+*******************
+
+Restored Python 2.5 support
+===========================
+
+2.3.3 restores Python 2.5 suppport for the django CMS.
+
+
+********************
+Pending deprecations
+********************
+
+Python 2.5 support will be dropped in django CMS 2.4.
View
39 docs/upgrade/index.rst
@@ -1,39 +0,0 @@
-###################################
-Upgrading a django CMS installation
-###################################
-
-*************
-2.3.2 Release
-*************
-
-.. toctree::
- :maxdepth: 1
-
- 2.3.2
-
-***********
-2.3 Release
-***********
-
-.. toctree::
- :maxdepth: 1
-
- 2.3
-
-***********
-2.2 Release
-***********
-
-.. toctree::
- :maxdepth: 1
-
- 2.2
-
-******************
-Upgrade from 2.1.x
-******************
-
-.. toctree::
- :maxdepth: 1
-
- 2.1
Please sign in to comment.
Something went wrong with that request. Please try again.