plone.app.contenttypes/issue-2066-raw-mimetype-master: Merge branch 'master' into issue-2066-raw-mimetype-master

Repository: plone.app.contenttypes
Branch: refs/heads/issue-2066-raw-mimetype-master
Date: 2017-08-01T22:57:49+02:00
Author: Jens W. Klein (jensens) <jk-jUMamYRpa/IasaSY4/nUZ7NldLUNz+W/@public.gmane.org>
Commit: https://github.com/plone/plone.app.contenttypes/commit/fe3d6472e2253477eff642bc5e6731266ccc08f0

Merge branch 'master' into issue-2066-raw-mimetype-master

Files changed:
M CHANGES.rst
M plone/app/contenttypes/migration/topics.py
M plone/app/contenttypes/tests/test_migration_topic.py
M setup.py

diff --git a/CHANGES.rst b/CHANGES.rst
index c6ed7d13..fab05499 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,12 +24,18 @@ Bug fixes:
   `Issue 2066 <https://github.com/plone/Products.CMFPlone/issues/2066>`_.
   [maurits]
 
+- Migrate the richtext-field 'text' when migrating ATTopics to Collections.
+  [pbauer]
+
 - Remove Language='all' from migration-query since it was removed from p.a.multilingual
   [pbauer]
 
 - Actually migrate all migratable types when passing 'all' to at-dx migration.
   [pbauer]
 
+- Remove plone.app.robotframework 'reload' extra.
+  This allows to remove quite some other external dependencies that are not Python 3 compatible.
+  [gforcada]
 
 1.4.1 (2017-07-03)
 ------------------
diff --git a/plone/app/contenttypes/migration/topics.py b/plone/app/contenttypes/migration/topics.py
index 6550cd9c..fb021fa9 100644
--- a/plone/app/contenttypes/migration/topics.py
+++ b/plone/app/contenttypes/migration/topics.py
@@ -10,6 +10,7 @@
 
 from DateTime import DateTime
 from plone.app.contenttypes.behaviors.collection import ICollection
+from plone.app.contenttypes.migration.field_migrators import migrate_richtextfield  # noqa: E501
 from plone.app.contenttypes.upgrades import LISTING_VIEW_MAPPING
 from plone.app.querystring.interfaces import IQuerystringRegistryReader
 from plone.registry.interfaces import IRegistry
@@ -546,6 +547,9 @@ def migrate_atctmetadata(self):
         field = self.old.getField('excludeFromNav')
         self.new.exclude_from_nav = field.get(self.old)
 
+    def migrate_schema_fields(self):
+        migrate_richtextfield(self.old, self.new, 'text', 'text')
+
     def migrate_at_uuid(self):
         """Migrate AT universal uid
         """
@@ -651,6 +655,9 @@ def migrate_atctmetadata(self):
         field = self.old.getField('excludeFromNav')
         self.new.exclude_from_nav = field.get(self.old)
 
+    def migrate_schema_fields(self):
+        migrate_richtextfield(self.old, self.new, 'text', 'text')
+
     def migrate_at_uuid(self):
         """Migrate AT universal uid
         """
diff --git a/plone/app/contenttypes/tests/test_migration_topic.py b/plone/app/contenttypes/tests/test_migration_topic.py
index c616564a..6a1dfafc 100644
--- a/plone/app/contenttypes/tests/test_migration_topic.py
+++ b/plone/app/contenttypes/tests/test_migration_topic.py
@@ -79,6 +79,7 @@ def test_migrate_topic_fields(self):
         self.assertEqual(self.portal.topic.portal_type, 'Collection')
         self.assertEqual(new.limit, 42)
         self.assertEqual(new.customViewFields, ('Title', 'Type'))
+        self.assertEqual(self.portal.topic.text.raw, u'<p>Hello</p>')
 
     def test_migrate_layout(self):
         self.portal.topic.setLayout('folder_summary_view')
diff --git a/setup.py b/setup.py
index d855088b..eee13ef2 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ def read(*rnames):
           'test': [
               'archetypes.schemaextender',
               'lxml',
-              'plone.app.robotframework [debug, reload] > 0.9.8',  # create image and file content for Image, File and News Item if not given.  # noqa
+              'plone.app.robotframework [debug] > 0.9.8',  # create image and file content for Image, File and News Item if not given.  # noqa
               'plone.app.testing [robot] >= 4.2.4',  # we need ROBOT_TEST_LEVEL
               # 'plone.dexterity >= 2.3.0',  # fixes setting default values # NOT RELEASED YET. # noqa
               'Products.ATContentTypes',



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot