Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate BBB controlpanel adapter. #3735

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Products/CMFPlone/controlpanel/bbb/editing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
14 changes: 10 additions & 4 deletions Products/CMFPlone/controlpanel/bbb/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
65 changes: 36 additions & 29 deletions Products/CMFPlone/controlpanel/bbb/language.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,131 +5,138 @@
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

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

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

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

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

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

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

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

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

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

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

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

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

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
)
49 changes: 30 additions & 19 deletions Products/CMFPlone/controlpanel/bbb/mail.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
12 changes: 10 additions & 2 deletions Products/CMFPlone/controlpanel/bbb/maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion Products/CMFPlone/controlpanel/bbb/markup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
Loading