Merge remote-tracking branch 'origin/develop' into custom-admin-namespace

Conflicts:
	cms/templates/cms/toolbar/plugin.html

Author: ojii

README.rst

@@ -4,9 +4,9 @@ django CMS
 .. image:: https://api.travis-ci.org/divio/django-cms.svg?branch=develop
     :target: http://travis-ci.org/divio/django-cms
 .. image:: https://pypip.in/v/django-cms/badge.svg
-    :target: https://crate.io/packages/django-cms/
+    :target: https://pypi.python.org/pypi/django-cms/
 .. image:: https://pypip.in/d/django-cms/badge.svg
-    :target: https://crate.io/packages/django-cms/
+    :target: https://pypi.python.org/pypi/django-cms/
 .. image:: https://pypip.in/wheel/django-cms/badge.svg
     :target: https://pypi.python.org/pypi/django-cms/
 .. image:: https://pypip.in/license/django-cms/badge.svg

cms/migrations/0068_auto__chg_field_placeholder_slot.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='placeholder',
+            name='slot',
+            field=models.CharField(verbose_name='slot', max_length=255, editable=False, db_index=True),
+        ),
+    ]

cms/migrations_django/0002_auto_20140807_2306.py

@@ -18,7 +18,7 @@
 
 @python_2_unicode_compatible
 class Placeholder(models.Model):
-    slot = models.CharField(_("slot"), max_length=50, db_index=True, editable=False)
+    slot = models.CharField(_("slot"), max_length=255, db_index=True, editable=False)
     default_width = models.PositiveSmallIntegerField(_("width"), null=True, editable=False)
     cache_placeholder = True
 

cms/models/placeholdermodel.py

@@ -71,7 +71,7 @@ def register_plugin(self, plugin):
                         # TemplateDoesNotExist if the plugin's render_template
                         # does in fact exist, but it includes a template that
                         # doesn't.
-                        if e.message == template:
+                        if six.text_type(e) == template:
                             raise ImproperlyConfigured(
                                 "CMS Plugins must define a render template (%s) that exists: %s"
                                 % (plugin, template)

cms/plugin_pool.py

@@ -22,13 +22,13 @@
 		'onClose': {% if refresh_page %}'REFRESH_PAGE'{% else %}{% if redirect_on_close %}'{{ redirect_on_close }}'{% else %}false{% endif %}{% endif %},
 		'urls': {
 			'add_plugin': '{% if add_url %}{{ add_url }}{% else %}{% cms_admin_url "cms_page_add_plugin" %}}{% endif %}',
-			'edit_plugin': '{% if edit_url %}{{ edit_url }}{% else %}{% cms_admin_url "cms_page_edit_plugin" instance.pk %}{% endif %}',
+			'edit_plugin': '{% if edit_url %}{{ edit_url }}{% elif instance %}{% cms_admin_url "cms_page_edit_plugin" instance.pk %}{% endif %}',
 			'move_plugin': '{% if move_url %}{{ move_url }}{% else %}{% cms_admin_url "cms_page_move_plugin" %}{% endif %}',
-			'delete_plugin': '{% if delete_url %}{{ delete_url }}{% else %}{% cms_admin_url "cms_page_delete_plugin" instance.pk %}{% endif %}',
+			'delete_plugin': '{% if delete_url %}{{ delete_url }}{% elif instance %}{% cms_admin_url "cms_page_delete_plugin" instance.pk %}{% endif %}',
 			'copy_plugin': '{% cms_admin_url "cms_page_copy_plugins" %}'
 		} {% endlanguage %}
 	});
 });
 })(CMS.$);
 </script>{% endaddtoblock %}
-{% endspaceless %}
+{% endspaceless %}

cms/templates/cms/toolbar/plugin.html

@@ -362,7 +362,7 @@ def get_processors(self, context, plugin):
     def get_context(self, context, plugin):
         if not plugin:
             return {'content': ''}
-        
+
         processors=self.get_processors(context, plugin)
 
         return {'content': plugin.render_plugin(context, processors=processors)}

cms/templatetags/cms_tags.py

@@ -5,9 +5,6 @@
 from pyflakes.checker import Checker
 from pyflakes.reporter import Reporter
 
-import cms
-import menus
-
 
 def _pyflakes_report_with_nopyflakes(self, messageClass, node, *args, **kwargs):
     with open(self.filename, 'r') as code:
@@ -35,7 +32,7 @@ def _check_recursive(paths, reporter):
     return num_warnings
 
 
-def pyflakes():
+def pyflakes(packages):
     """
     Unfortunately, pyflakes does not have a way to suppress certain errors or
     a way to configure the checker class, so we have to monkey patch it.
@@ -46,9 +43,5 @@ def pyflakes():
     Checker.__init__ = _pyflakes_no_migrations
     Checker.report = _pyflakes_report_with_nopyflakes
     reporter = Reporter(sys.stdout, sys.stderr)
-    paths = [
-        os.path.abspath(os.path.dirname(cms.__file__)),
-        os.path.abspath(os.path.dirname(menus.__file__)),
-        os.path.abspath(__file__),
-    ]
+    paths = [os.path.dirname(package.__file__) for package in packages]
     return _check_recursive(paths, reporter)

cms/test_utils/util/static_analysis.py

@@ -7,4 +7,6 @@ class AboveStaticAnalysisCodeTest(TestCase):
     Name is pretty lame, but ensure it's executed before every other test
     """
     def test_pyflakes(self):
-        self.assertEqual(pyflakes(), 0)
+        import cms
+        import menus
+        self.assertEqual(pyflakes((cms, menus)), 0)