From 6d8a3ffbce9f3d10433c2b7e7b84537f1c04d230 Mon Sep 17 00:00:00 2001 From: esteele Date: Sat, 19 Sep 2015 18:25:54 +0200 Subject: [PATCH] This is an ascii field now, no need to safe_unicode --- plone/app/upgrade/v50/betas.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py index e07fea3e..55953e1b 100644 --- a/plone/app/upgrade/v50/betas.py +++ b/plone/app/upgrade/v50/betas.py @@ -523,7 +523,8 @@ def to50rc3(context): 'calendar_starting_year', 'calendar_future_years_available', 'redirect_links', - 'enable_checkout_workflow' + 'enable_checkout_workflow', + 'default_charset' ] for p in properties_to_migrate: if site_properties.hasProperty(p): @@ -551,11 +552,6 @@ def to50rc3(context): registry['plone.default_page_types'] = [safe_unicode(i) for i in value] site_properties._delProperty('default_page_types') - if site_properties.hasProperty('default_charset'): - value = site_properties.getProperty('default_charset') - registry['plone.default_charset'] = safe_unicode(value) - site_properties._delProperty('default_charset') - if site_properties.hasProperty('sitemapDepth'): value = site_properties.getProperty('sitemapDepth') registry['plone.sitemap_depth'] = value