diff --git a/Products/CMFPlone/controlpanel/bbb/editing.py b/Products/CMFPlone/controlpanel/bbb/editing.py index f5614a8cd9..6a9becb9cc 100644 --- a/Products/CMFPlone/controlpanel/bbb/editing.py +++ b/Products/CMFPlone/controlpanel/bbb/editing.py @@ -5,15 +5,22 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @implementer(IEditingSchema) class EditingControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.IEditingSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) registry = getUtility(IRegistry) - self.settings = registry.forInterface(IEditingSchema, prefix='plone') + self.settings = registry.forInterface(IEditingSchema, prefix="plone") def get_visible_ids(self): return self.settings.visible_ids @@ -47,8 +54,7 @@ def set_lock_on_ttw_edit(self, value): visible_ids = property(get_visible_ids, set_visible_ids) enable_link_integrity_checks = property( - get_enable_link_integrity_checks, - set_enable_link_integrity_checks + get_enable_link_integrity_checks, set_enable_link_integrity_checks ) ext_editor = property(get_ext_editor, set_ext_editor) default_editor = property(get_default_editor, set_default_editor) diff --git a/Products/CMFPlone/controlpanel/bbb/filter.py b/Products/CMFPlone/controlpanel/bbb/filter.py index 2da1d3dcb5..cdf6429a25 100644 --- a/Products/CMFPlone/controlpanel/bbb/filter.py +++ b/Products/CMFPlone/controlpanel/bbb/filter.py @@ -5,15 +5,22 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @implementer(IFilterSchema) class FilterControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.IFilterSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) registry = getUtility(IRegistry) - self.settings = registry.forInterface(IFilterSchema, prefix='plone') + self.settings = registry.forInterface(IFilterSchema, prefix="plone") def get_disable_filtering(self): return self.settings.disable_filtering @@ -39,8 +46,7 @@ def get_custom_attributes(self): def set_custom_attributes(self, value): self.settings.custom_attributes = value - custom_attributes = property( - get_custom_attributes, set_custom_attributes) + custom_attributes = property(get_custom_attributes, set_custom_attributes) valid_tags = property(get_valid_tags, set_valid_tags) nasty_tags = property(get_nasty_tags, set_nasty_tags) disable_filtering = property(get_disable_filtering, set_disable_filtering) diff --git a/Products/CMFPlone/controlpanel/bbb/language.py b/Products/CMFPlone/controlpanel/bbb/language.py index 8085b28cfb..55a5bc2a9a 100644 --- a/Products/CMFPlone/controlpanel/bbb/language.py +++ b/Products/CMFPlone/controlpanel/bbb/language.py @@ -5,17 +5,23 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @implementer(ILanguageSchema) class LanguageControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.ILanguageSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.context = context registry = getUtility(IRegistry) - self.settings = registry.forInterface( - ILanguageSchema, prefix="plone") + self.settings = registry.forInterface(ILanguageSchema, prefix="plone") def get_default_language(self): return self.settings.default_language @@ -23,8 +29,7 @@ def get_default_language(self): def set_default_language(self, value): self.settings.default_language = value - default_language = property(get_default_language, - set_default_language) + default_language = property(get_default_language, set_default_language) def get_available_languages(self): return self.settings.available_languages @@ -32,8 +37,7 @@ def get_available_languages(self): def set_available_languages(self, value): self.settings.available_languages = value - available_languages = property(get_available_languages, - set_available_languages) + available_languages = property(get_available_languages, set_available_languages) def get_use_combined_language_codes(self): return self.settings.use_combined_language_codes @@ -41,8 +45,9 @@ def get_use_combined_language_codes(self): def set_use_combined_language_codes(self, value): self.settings.use_combined_language_codes = value - use_combined_language_codes = property(get_use_combined_language_codes, - set_use_combined_language_codes) + use_combined_language_codes = property( + get_use_combined_language_codes, set_use_combined_language_codes + ) def get_display_flags(self): return self.settings.display_flags @@ -50,8 +55,7 @@ def get_display_flags(self): def set_display_flags(self, value): self.settings.display_flags = value - display_flags = property(get_display_flags, - set_display_flags) + display_flags = property(get_display_flags, set_display_flags) def get_always_show_selector(self): return self.settings.always_show_selector @@ -59,8 +63,7 @@ def get_always_show_selector(self): def set_always_show_selector(self, value): self.settings.always_show_selector = value - always_show_selector = property(get_always_show_selector, - set_always_show_selector) + always_show_selector = property(get_always_show_selector, set_always_show_selector) def get_use_content_negotiation(self): return self.settings.use_content_negotiation @@ -68,8 +71,9 @@ def get_use_content_negotiation(self): def set_use_content_negotiation(self, value): self.settings.use_content_negotiation = value - use_content_negotiation = property(get_use_content_negotiation, - set_use_content_negotiation) + use_content_negotiation = property( + get_use_content_negotiation, set_use_content_negotiation + ) def get_use_path_negotiation(self): return self.settings.use_path_negotiation @@ -77,8 +81,7 @@ def get_use_path_negotiation(self): def set_use_path_negotiation(self, value): self.settings.use_path_negotiation = value - use_path_negotiation = property(get_use_path_negotiation, - set_use_path_negotiation) + use_path_negotiation = property(get_use_path_negotiation, set_use_path_negotiation) def get_use_cookie_negotiation(self): return self.settings.use_cookie_negotiation @@ -86,8 +89,9 @@ def get_use_cookie_negotiation(self): def set_use_cookie_negotiation(self, value): self.settings.use_cookie_negotiation = value - use_cookie_negotiation = property(get_use_cookie_negotiation, - set_use_cookie_negotiation) + use_cookie_negotiation = property( + get_use_cookie_negotiation, set_use_cookie_negotiation + ) def get_authenticated_users_only(self): return self.settings.authenticated_users_only @@ -95,8 +99,9 @@ def get_authenticated_users_only(self): def set_authenticated_users_only(self, value): self.settings.authenticated_users_only = value - authenticated_users_only = property(get_authenticated_users_only, - set_authenticated_users_only) + authenticated_users_only = property( + get_authenticated_users_only, set_authenticated_users_only + ) def get_set_cookie_always(self): return self.settings.set_cookie_always @@ -104,8 +109,7 @@ def get_set_cookie_always(self): def set_set_cookie_always(self, value): self.settings.set_cookie_always = value - set_cookie_always = property(get_set_cookie_always, - set_set_cookie_always) + set_cookie_always = property(get_set_cookie_always, set_set_cookie_always) def get_use_subdomain_negotiation(self): return self.settings.use_subdomain_negotiation @@ -113,8 +117,9 @@ def get_use_subdomain_negotiation(self): def set_use_subdomain_negotiation(self, value): self.settings.use_subdomain_negotiation = value - use_subdomain_negotiation = property(get_use_subdomain_negotiation, - set_use_subdomain_negotiation) + use_subdomain_negotiation = property( + get_use_subdomain_negotiation, set_use_subdomain_negotiation + ) def get_use_cctld_negotiation(self): return self.settings.use_cctld_negotiation @@ -122,8 +127,9 @@ def get_use_cctld_negotiation(self): def set_use_cctld_negotiation(self, value): self.settings.use_cctld_negotiation = value - use_cctld_negotiation = property(get_use_cctld_negotiation, - set_use_cctld_negotiation) + use_cctld_negotiation = property( + get_use_cctld_negotiation, set_use_cctld_negotiation + ) def get_use_request_negotiation(self): return self.settings.use_request_negotiation @@ -131,5 +137,6 @@ def get_use_request_negotiation(self): def set_use_request_negotiation(self, value): self.settings.use_request_negotiation = value - use_request_negotiation = property(get_use_request_negotiation, - set_use_request_negotiation) + use_request_negotiation = property( + get_use_request_negotiation, set_use_request_negotiation + ) diff --git a/Products/CMFPlone/controlpanel/bbb/mail.py b/Products/CMFPlone/controlpanel/bbb/mail.py index cdddaa2e8d..fe0fae954b 100644 --- a/Products/CMFPlone/controlpanel/bbb/mail.py +++ b/Products/CMFPlone/controlpanel/bbb/mail.py @@ -7,66 +7,78 @@ from zope.component.hooks import getSite from zope.interface import implementer +import warnings + @implementer(IMailSchema) class MailControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.controlpanel.IMailSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.context = context self.portal = getSite() registry = getUtility(IRegistry) - self.encoding = 'utf-8' - self.mail_settings = registry.forInterface( - IMailSchema, prefix="plone") + self.encoding = "utf-8" + self.mail_settings = registry.forInterface(IMailSchema, prefix="plone") def get_smtp_host(self): return self.mail_settings.smtp_host def set_smtp_host(self, value): - if safe_hasattr(self.mail_settings, 'smtp_host'): + if safe_hasattr(self.mail_settings, "smtp_host"): self.mail_settings.smtp_host = value smtp_host = property(get_smtp_host, set_smtp_host) def get_smtp_port(self): - return getattr(self.mail_settings, 'smtp_port', None) + return getattr(self.mail_settings, "smtp_port", None) def set_smtp_port(self, value): - if safe_hasattr(self.mail_settings, 'smtp_port'): + if safe_hasattr(self.mail_settings, "smtp_port"): self.mail_settings.smtp_port = value smtp_port = property(get_smtp_port, set_smtp_port) def get_smtp_userid(self): - return getattr(self.mail_settings, 'smtp_userid', - getattr(self.mail_settings, 'smtp_userid', None)) + return getattr( + self.mail_settings, + "smtp_userid", + getattr(self.mail_settings, "smtp_userid", None), + ) def set_smtp_userid(self, value): - if safe_hasattr(self.mail_settings, 'smtp_userid'): + if safe_hasattr(self.mail_settings, "smtp_userid"): self.mail_settings.smtp_userid = value # SecureMailhost 1.x also uses this: - if safe_hasattr(self.mail_settings, '_smtp_userid'): + if safe_hasattr(self.mail_settings, "_smtp_userid"): self.mail_settings._smtp_userid = value - elif safe_hasattr(self.mail_settings, 'smtp_userid'): + elif safe_hasattr(self.mail_settings, "smtp_userid"): self.mail_settings.smtp_uid = value smtp_userid = property(get_smtp_userid, set_smtp_userid) def get_smtp_pass(self): - return getattr(self.mail_settings, 'smtp_pass', - getattr(self.mail_settings, 'smtp_pwd', None)) + return getattr( + self.mail_settings, + "smtp_pass", + getattr(self.mail_settings, "smtp_pwd", None), + ) def set_smtp_pass(self, value): # Don't update the value, if we don't get a new one if value is not None: - if safe_hasattr(self.mail_settings, 'smtp_pass'): + if safe_hasattr(self.mail_settings, "smtp_pass"): self.mail_settings.smtp_pass = value # SecureMailhost 1.x also uses this: - if safe_hasattr(self.mail_settings, '_smtp_pass'): + if safe_hasattr(self.mail_settings, "_smtp_pass"): self.mail_settings._smtp_pass = value - elif safe_hasattr(self.mail_settings, 'smtp_pwd'): + elif safe_hasattr(self.mail_settings, "smtp_pwd"): self.mail_settings.smtp_pwd = value smtp_pass = property(get_smtp_pass, set_smtp_pass) @@ -85,5 +97,4 @@ def get_email_from_address(self): def set_email_from_address(self, value): self.mail_settings.email_from_address = value - email_from_address = property(get_email_from_address, - set_email_from_address) + email_from_address = property(get_email_from_address, set_email_from_address) diff --git a/Products/CMFPlone/controlpanel/bbb/maintenance.py b/Products/CMFPlone/controlpanel/bbb/maintenance.py index 941fea458b..66c8e0cf98 100644 --- a/Products/CMFPlone/controlpanel/bbb/maintenance.py +++ b/Products/CMFPlone/controlpanel/bbb/maintenance.py @@ -5,17 +5,25 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @implementer(IMaintenanceSchema) class MaintenanceControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.IMaintenanceSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.context = context registry = getUtility(IRegistry) self.maintenance_settings = registry.forInterface( - IMaintenanceSchema, prefix="plone") + IMaintenanceSchema, prefix="plone" + ) def get_days(self): return self.maintenance_settings.days diff --git a/Products/CMFPlone/controlpanel/bbb/markup.py b/Products/CMFPlone/controlpanel/bbb/markup.py index 2434f6b84b..4f6670463c 100644 --- a/Products/CMFPlone/controlpanel/bbb/markup.py +++ b/Products/CMFPlone/controlpanel/bbb/markup.py @@ -5,13 +5,20 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @implementer(IMarkupSchema) class MarkupControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.IMarkupSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) registry = getUtility(IRegistry) self.settings = registry.forInterface(IMarkupSchema, prefix="plone") diff --git a/Products/CMFPlone/controlpanel/bbb/navigation.py b/Products/CMFPlone/controlpanel/bbb/navigation.py index 05705ccb77..d5e4120be8 100644 --- a/Products/CMFPlone/controlpanel/bbb/navigation.py +++ b/Products/CMFPlone/controlpanel/bbb/navigation.py @@ -5,17 +5,23 @@ from zope.component import getUtility from zope.interface import implementer +import warnings + @adapter(IPloneSiteRoot) @implementer(INavigationSchema) class NavigationControlPanelAdapter: - def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.INavigationSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.context = context registry = getUtility(IRegistry) self.navigation_settings = registry.forInterface( - INavigationSchema, - prefix="plone" + INavigationSchema, prefix="plone" ) def get_generate_tabs(self): @@ -40,10 +46,7 @@ def get_show_excluded_items(self): def set_show_excluded_items(self, value): self.navigation_settings.show_excluded_items = value - show_excluded_items = property( - get_show_excluded_items, - set_show_excluded_items - ) + show_excluded_items = property(get_show_excluded_items, set_show_excluded_items) def get_displayed_types(self): return self.navigation_settings.displayed_types @@ -59,10 +62,7 @@ def get_filter_on_workflow(self): def set_filter_on_workflow(self, value): self.navigation_settings.filter_on_workflow = value - filter_on_workflow = property( - get_filter_on_workflow, - set_filter_on_workflow - ) + filter_on_workflow = property(get_filter_on_workflow, set_filter_on_workflow) def get_workflow_states_to_show(self): return self.navigation_settings.workflow_states_to_show @@ -71,8 +71,8 @@ def set_workflow_states_to_show(self, value): self.navigation_settings.workflow_states_to_show = value workflow_states_to_show = property( - get_workflow_states_to_show, - set_workflow_states_to_show) + get_workflow_states_to_show, set_workflow_states_to_show + ) @property def root(self): diff --git a/Products/CMFPlone/controlpanel/bbb/search.py b/Products/CMFPlone/controlpanel/bbb/search.py index 784a30d448..755e3ac5ea 100644 --- a/Products/CMFPlone/controlpanel/bbb/search.py +++ b/Products/CMFPlone/controlpanel/bbb/search.py @@ -6,17 +6,23 @@ from zope.component.hooks import getSite from zope.interface import implementer +import warnings + @implementer(ISearchSchema) class SearchControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.ISearchSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.portal = getSite() registry = getUtility(IRegistry) - self.search_settings = registry.forInterface( - ISearchSchema, prefix="plone") + self.search_settings = registry.forInterface(ISearchSchema, prefix="plone") def get_enable_livesearch(self): return self.search_settings.enable_livesearch @@ -35,10 +41,7 @@ def get_types_not_searched(self): def set_types_not_searched(self, value): self.search_settings.types_not_searched = value - types_not_searched = property( - get_types_not_searched, - set_types_not_searched - ) + types_not_searched = property(get_types_not_searched, set_types_not_searched) @property def sort_on(self): diff --git a/Products/CMFPlone/controlpanel/bbb/security.py b/Products/CMFPlone/controlpanel/bbb/security.py index b1b48f16ae..421799f12a 100644 --- a/Products/CMFPlone/controlpanel/bbb/security.py +++ b/Products/CMFPlone/controlpanel/bbb/security.py @@ -7,18 +7,24 @@ from zope.component.hooks import getSite from zope.interface import implementer +import warnings + @implementer(ISecuritySchema) class SecurityControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.ISecuritySchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.portal = getSite() - self.pmembership = getToolByName(context, 'portal_membership') + self.pmembership = getToolByName(context, "portal_membership") registry = getUtility(IRegistry) - self.settings = registry.forInterface( - ISecuritySchema, prefix="plone") + self.settings = registry.forInterface(ISecuritySchema, prefix="plone") def get_enable_self_reg(self): return self.settings.enable_self_reg @@ -35,8 +41,9 @@ def get_enable_user_pwd_choice(self): def set_enable_user_pwd_choice(self, value): self.settings.enable_user_pwd_choice = value - enable_user_pwd_choice = property(get_enable_user_pwd_choice, - set_enable_user_pwd_choice) + enable_user_pwd_choice = property( + get_enable_user_pwd_choice, set_enable_user_pwd_choice + ) def get_enable_user_folders(self): return self.settings.enable_user_folders @@ -45,8 +52,7 @@ def set_enable_user_folders(self, value): # additional processing in the event handler self.settings.enable_user_folders = value - enable_user_folders = property(get_enable_user_folders, - set_enable_user_folders) + enable_user_folders = property(get_enable_user_folders, set_enable_user_folders) def get_allow_anon_views_about(self): return self.settings.allow_anon_views_about @@ -54,8 +60,9 @@ def get_allow_anon_views_about(self): def set_allow_anon_views_about(self, value): self.settings.allow_anon_views_about = value - allow_anon_views_about = property(get_allow_anon_views_about, - set_allow_anon_views_about) + allow_anon_views_about = property( + get_allow_anon_views_about, set_allow_anon_views_about + ) def get_use_email_as_login(self): return self.settings.use_email_as_login @@ -64,8 +71,7 @@ def set_use_email_as_login(self, value): # additional processing in the event handler self.settings.use_email_as_login = value - use_email_as_login = property(get_use_email_as_login, - set_use_email_as_login) + use_email_as_login = property(get_use_email_as_login, set_use_email_as_login) def get_use_uuid_as_userid(self): return self.settings.use_uuid_as_userid @@ -73,5 +79,4 @@ def get_use_uuid_as_userid(self): def set_use_uuid_as_userid(self, value): self.settings.use_uuid_as_userid = value - use_uuid_as_userid = property(get_use_uuid_as_userid, - set_use_uuid_as_userid) + use_uuid_as_userid = property(get_use_uuid_as_userid, set_use_uuid_as_userid) diff --git a/Products/CMFPlone/controlpanel/bbb/site.py b/Products/CMFPlone/controlpanel/bbb/site.py index 73402b154d..ec7b63c8c8 100644 --- a/Products/CMFPlone/controlpanel/bbb/site.py +++ b/Products/CMFPlone/controlpanel/bbb/site.py @@ -6,13 +6,20 @@ from zope.interface import implementer from zope.schema.fieldproperty import FieldProperty +import warnings + @implementer(ISiteSchema) class SiteControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.ISiteSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) registry = getUtility(IRegistry) self.settings = registry.forInterface(ISiteSchema, prefix="plone") @@ -31,6 +38,6 @@ def set_webstats_js(self, value): site_title = property(get_site_title, set_site_title) webstats_js = property(get_webstats_js, set_webstats_js) - site_logo = FieldProperty(ISiteSchema['site_logo']) - enable_sitemap = FieldProperty(ISiteSchema['enable_sitemap']) - exposeDCMetaTags = FieldProperty(ISiteSchema['exposeDCMetaTags']) + site_logo = FieldProperty(ISiteSchema["site_logo"]) + enable_sitemap = FieldProperty(ISiteSchema["enable_sitemap"]) + exposeDCMetaTags = FieldProperty(ISiteSchema["exposeDCMetaTags"]) diff --git a/Products/CMFPlone/controlpanel/bbb/usergroups.py b/Products/CMFPlone/controlpanel/bbb/usergroups.py index 0c819c7136..6b8a7645ff 100644 --- a/Products/CMFPlone/controlpanel/bbb/usergroups.py +++ b/Products/CMFPlone/controlpanel/bbb/usergroups.py @@ -6,18 +6,26 @@ from zope.component.hooks import getSite from zope.interface import implementer +import warnings + @implementer(IUserGroupsSettingsSchema) class UserGroupsSettingsControlPanelAdapter: - adapts(IPloneSiteRoot) def __init__(self, context): + warnings.warn( + f"Usage of bbb controlpanel '{self.__class__.__name__}' is deprecated." + "Use registry record plone.base.interfaces.IUserGroupsSettingsSchema instead." + "It will be removed in Plone 6.1", + DeprecationWarning, + ) self.context = context self.portal = getSite() registry = getUtility(IRegistry) self.usergroups_settings = registry.forInterface( - IUserGroupsSettingsSchema, prefix="plone") + IUserGroupsSettingsSchema, prefix="plone" + ) def get_many_groups(self): return self.usergroups_settings.many_groups