-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2018-03-02T10:25:13+01:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.theme@066aa96 Handle case where we get no skinname in Zope4 Files changed: M CHANGES.rst M plone/theme/layer.py Repository: plone.theme Branch: refs/heads/master Date: 2018-03-02T10:25:13+01:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.theme@4ee3b96 fix wrong condition for missing skinname Files changed: M plone/theme/layer.py Repository: plone.theme Branch: refs/heads/master Date: 2018-03-18T20:25:54+01:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/plone.theme@16c1a4d Merge pull request #7 from plone/plonezope4 Handle case where ther is no skinname when migrating to Plone 5.2 Files changed: M CHANGES.rst M plone/theme/layer.py
- Loading branch information
Showing
1 changed file
with
111 additions
and
198 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,255 +1,168 @@ | ||
| Repository: Products.PortalTransforms | ||
| Repository: plone.theme | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-03-17T09:08:45+01:00 | ||
| Date: 2018-03-02T10:25:13+01:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/d53e9bc780cabe3c7d4a1d950c30631ce8e140a9 | ||
| Commit: https://github.com/plone/plone.theme/commit/066aa963852da9adadebb27307c85daf8adc45f3 | ||
|
|
||
| Begin fixing startup in py3 | ||
| Handle case where we get no skinname in Zope4 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/PortalTransforms/Transform.py | ||
| M Products/PortalTransforms/chain.py | ||
| M plone/theme/layer.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 0dd98c7..30c4f79 100644 | ||
| index 6229636..d908228 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -22,6 +22,9 @@ Bug fixes: | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| +- Start fixing startup in py3 | ||
| -- *add item here* | ||
| +- Handle case where we get no skinname in Zope4. | ||
| + [pbauer] | ||
| + | ||
| - Add Python 2 / 3 compatibility. [maurits] | ||
|
|
||
|
|
||
| diff --git a/Products/PortalTransforms/Transform.py b/Products/PortalTransforms/Transform.py | ||
| index 979af39..1cc9961 100644 | ||
| --- a/Products/PortalTransforms/Transform.py | ||
| +++ b/Products/PortalTransforms/Transform.py | ||
| @@ -13,11 +13,13 @@ | ||
| from Products.PortalTransforms.utils import _www | ||
| from Products.PortalTransforms.utils import log | ||
| from Products.PortalTransforms.utils import TransformException | ||
| -from UserDict import UserDict | ||
| +from six.moves import reload_module | ||
| from zope.interface import implementer | ||
|
|
||
| 3.0.3 (2017-07-03) | ||
| diff --git a/plone/theme/layer.py b/plone/theme/layer.py | ||
| index 2451c5c..ac202d7 100644 | ||
| --- a/plone/theme/layer.py | ||
| +++ b/plone/theme/layer.py | ||
| @@ -1,12 +1,11 @@ | ||
| -from zope.interface import directlyProvides, directlyProvidedBy | ||
| +# -*- coding: utf-8 -*- | ||
| +from plone.theme.interfaces import IDefaultPloneLayer | ||
| +from Products.CMFCore.utils import getToolByName | ||
| from zope.component import queryUtility | ||
| - | ||
| -from six.moves import reload_module | ||
| +try: | ||
| + from collections import UserDict | ||
| +except ImportError: | ||
| + from UserDict import UserDict | ||
|
|
||
|
|
||
| def import_from_name(module_name): | ||
| @@ -57,6 +59,7 @@ def make_config_nonpersistent(kwargs): | ||
| p_value = list(value) | ||
| kwargs[key] = p_value | ||
|
|
||
| + | ||
| VALIDATORS = { | ||
| 'int': int, | ||
| 'string': str, | ||
| diff --git a/Products/PortalTransforms/chain.py b/Products/PortalTransforms/chain.py | ||
| index ede5222..cadf523 100644 | ||
| --- a/Products/PortalTransforms/chain.py | ||
| +++ b/Products/PortalTransforms/chain.py | ||
| @@ -11,11 +11,12 @@ | ||
| from Products.PortalTransforms.interfaces import IChain | ||
| from Products.PortalTransforms.interfaces import ITransform | ||
| from Products.PortalTransforms.utils import _www | ||
| -from UserList import UserList | ||
| from zope.interface import implementer | ||
| +from zope.interface import directlyProvides, directlyProvidedBy | ||
| from zope.publisher.interfaces.browser import IBrowserSkinType | ||
| from zope.publisher.interfaces.browser import IDefaultBrowserLayer | ||
|
|
||
| -from Products.CMFCore.utils import getToolByName | ||
| -from plone.theme.interfaces import IDefaultPloneLayer | ||
| - | ||
| -from six.moves import reload_module | ||
| +try: | ||
| + from collections import UserList | ||
| +except ImportError: | ||
| + from UserList import UserList | ||
|
|
||
|
|
||
| @implementer(IChain, ITransform) | ||
|
|
||
|
|
||
| Repository: Products.PortalTransforms | ||
| default_layers = [ | ||
| IDefaultPloneLayer, | ||
| IDefaultBrowserLayer, | ||
| @@ -17,13 +16,15 @@ def mark_layer(site, event): | ||
| """Mark the request with a layer corresponding to the current skin, | ||
| as set in the portal_skins tool. | ||
| """ | ||
| - if getattr(event.request, "_plonetheme_", False): | ||
| + if getattr(event.request, '_plonetheme_', False): | ||
| return | ||
| - event.request._plonetheme_=True | ||
| + event.request._plonetheme_ = True | ||
|
|
||
| portal_skins = getToolByName(site, 'portal_skins', None) | ||
| if portal_skins is not None: | ||
| skin_name = site.getCurrentSkinName() | ||
| + if skin_name is not None: | ||
| + return | ||
| skin = queryUtility(IBrowserSkinType, name=skin_name) | ||
| if skin is not None: | ||
| layer_ifaces = [] | ||
|
|
||
|
|
||
| Repository: plone.theme | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-03-17T09:08:45+01:00 | ||
| Date: 2018-03-02T10:25:13+01:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/cb30a2c03ade2903a9b4f15600c26cbea4ef4c84 | ||
| Commit: https://github.com/plone/plone.theme/commit/4ee3b96dfc008cb3f5844574dabf9d0399c87bae | ||
|
|
||
| rename name to name_ to prevent slash with class variable in py3 | ||
| fix wrong condition for missing skinname | ||
|
|
||
| Files changed: | ||
| M Products/PortalTransforms/data.py | ||
|
|
||
| diff --git a/Products/PortalTransforms/data.py b/Products/PortalTransforms/data.py | ||
| index 00e379b..39c21ae 100644 | ||
| --- a/Products/PortalTransforms/data.py | ||
| +++ b/Products/PortalTransforms/data.py | ||
| @@ -7,11 +7,11 @@ class datastream(object): | ||
| """A transformation datastream packet""" | ||
|
|
||
| __slots__ = ( | ||
| - 'name', '_data', '_metadata', '__name__', '_objects', '_cacheable' | ||
| + 'name_', '_data', '_metadata', '__name__', '_objects', '_cacheable' | ||
| ) | ||
|
|
||
| - def __init__(self, name): | ||
| - self.__name__ = name | ||
| + def __init__(self, name_): | ||
| + self.__name__ = name_ | ||
| self._data = '' | ||
| self._metadata = {} | ||
| self._objects = {} | ||
| M plone/theme/layer.py | ||
|
|
||
| diff --git a/plone/theme/layer.py b/plone/theme/layer.py | ||
| index ac202d7..70c2195 100644 | ||
| --- a/plone/theme/layer.py | ||
| +++ b/plone/theme/layer.py | ||
| @@ -23,7 +23,7 @@ def mark_layer(site, event): | ||
| portal_skins = getToolByName(site, 'portal_skins', None) | ||
| if portal_skins is not None: | ||
| skin_name = site.getCurrentSkinName() | ||
| - if skin_name is not None: | ||
| + if skin_name is None: | ||
| return | ||
| skin = queryUtility(IBrowserSkinType, name=skin_name) | ||
| if skin is not None: | ||
|
|
||
| Repository: Products.PortalTransforms | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-03-17T09:09:17+01:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/39a89ccbbbb1febf207eb04b7fa2681c40ac03bc | ||
|
|
||
| fix changelog | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 30c4f79..2203dca 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Start fixing startup in py3 | ||
| + [pbauer] | ||
|
|
||
|
|
||
| 3.1.2 (2018-02-05) | ||
| @@ -22,9 +23,6 @@ Bug fixes: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- Start fixing startup in py3 | ||
| - [pbauer] | ||
| - | ||
| - Add Python 2 / 3 compatibility. [maurits] | ||
|
|
||
|
|
||
|
|
||
|
|
||
| Repository: Products.PortalTransforms | ||
| Repository: plone.theme | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-03-18T19:17:50+01:00 | ||
| Date: 2018-03-18T20:25:54+01:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/42a836b24cd4803f16520ac79ff0f3d70f0dd8ff | ||
| Commit: https://github.com/plone/plone.theme/commit/16c1a4d6324cf2cdf44a50fc01d5fffb9fd9a0ce | ||
|
|
||
| Merge pull request #28 from plone/python3 | ||
| Merge pull request #7 from plone/plonezope4 | ||
|
|
||
| Begin fixing startup in py3 | ||
| Handle case where ther is no skinname when migrating to Plone 5.2 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/PortalTransforms/Transform.py | ||
| M Products/PortalTransforms/chain.py | ||
| M Products/PortalTransforms/data.py | ||
| M plone/theme/layer.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 0dd98c7..2203dca 100644 | ||
| index 98e0259..fc37d03 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Start fixing startup in py3 | ||
| +- Handle case where we get no skinname in Zope4. | ||
| + [pbauer] | ||
|
|
||
|
|
||
| 3.1.2 (2018-02-05) | ||
| diff --git a/Products/PortalTransforms/Transform.py b/Products/PortalTransforms/Transform.py | ||
| index 979af39..1cc9961 100644 | ||
| --- a/Products/PortalTransforms/Transform.py | ||
| +++ b/Products/PortalTransforms/Transform.py | ||
| @@ -13,11 +13,13 @@ | ||
| from Products.PortalTransforms.utils import _www | ||
| from Products.PortalTransforms.utils import log | ||
| from Products.PortalTransforms.utils import TransformException | ||
| -from UserDict import UserDict | ||
| +from six.moves import reload_module | ||
| from zope.interface import implementer | ||
|
|
||
| 3.0.4 (2018-03-10) | ||
| diff --git a/plone/theme/layer.py b/plone/theme/layer.py | ||
| index 2451c5c..70c2195 100644 | ||
| --- a/plone/theme/layer.py | ||
| +++ b/plone/theme/layer.py | ||
| @@ -1,12 +1,11 @@ | ||
| -from zope.interface import directlyProvides, directlyProvidedBy | ||
| +# -*- coding: utf-8 -*- | ||
| +from plone.theme.interfaces import IDefaultPloneLayer | ||
| +from Products.CMFCore.utils import getToolByName | ||
| from zope.component import queryUtility | ||
| - | ||
| -from six.moves import reload_module | ||
| +try: | ||
| + from collections import UserDict | ||
| +except ImportError: | ||
| + from UserDict import UserDict | ||
|
|
||
|
|
||
| def import_from_name(module_name): | ||
| @@ -57,6 +59,7 @@ def make_config_nonpersistent(kwargs): | ||
| p_value = list(value) | ||
| kwargs[key] = p_value | ||
|
|
||
| + | ||
| VALIDATORS = { | ||
| 'int': int, | ||
| 'string': str, | ||
| diff --git a/Products/PortalTransforms/chain.py b/Products/PortalTransforms/chain.py | ||
| index ede5222..cadf523 100644 | ||
| --- a/Products/PortalTransforms/chain.py | ||
| +++ b/Products/PortalTransforms/chain.py | ||
| @@ -11,11 +11,12 @@ | ||
| from Products.PortalTransforms.interfaces import IChain | ||
| from Products.PortalTransforms.interfaces import ITransform | ||
| from Products.PortalTransforms.utils import _www | ||
| -from UserList import UserList | ||
| from zope.interface import implementer | ||
| +from zope.interface import directlyProvides, directlyProvidedBy | ||
| from zope.publisher.interfaces.browser import IBrowserSkinType | ||
| from zope.publisher.interfaces.browser import IDefaultBrowserLayer | ||
|
|
||
| -from Products.CMFCore.utils import getToolByName | ||
| -from plone.theme.interfaces import IDefaultPloneLayer | ||
| - | ||
| -from six.moves import reload_module | ||
| +try: | ||
| + from collections import UserList | ||
| +except ImportError: | ||
| + from UserList import UserList | ||
|
|
||
|
|
||
| @implementer(IChain, ITransform) | ||
| diff --git a/Products/PortalTransforms/data.py b/Products/PortalTransforms/data.py | ||
| index 00e379b..39c21ae 100644 | ||
| --- a/Products/PortalTransforms/data.py | ||
| +++ b/Products/PortalTransforms/data.py | ||
| @@ -7,11 +7,11 @@ class datastream(object): | ||
| """A transformation datastream packet""" | ||
|
|
||
| __slots__ = ( | ||
| - 'name', '_data', '_metadata', '__name__', '_objects', '_cacheable' | ||
| + 'name_', '_data', '_metadata', '__name__', '_objects', '_cacheable' | ||
| ) | ||
|
|
||
| - def __init__(self, name): | ||
| - self.__name__ = name | ||
| + def __init__(self, name_): | ||
| + self.__name__ = name_ | ||
| self._data = '' | ||
| self._metadata = {} | ||
| self._objects = {} | ||
| default_layers = [ | ||
| IDefaultPloneLayer, | ||
| IDefaultBrowserLayer, | ||
| @@ -17,13 +16,15 @@ def mark_layer(site, event): | ||
| """Mark the request with a layer corresponding to the current skin, | ||
| as set in the portal_skins tool. | ||
| """ | ||
| - if getattr(event.request, "_plonetheme_", False): | ||
| + if getattr(event.request, '_plonetheme_', False): | ||
| return | ||
| - event.request._plonetheme_=True | ||
| + event.request._plonetheme_ = True | ||
|
|
||
| portal_skins = getToolByName(site, 'portal_skins', None) | ||
| if portal_skins is not None: | ||
| skin_name = site.getCurrentSkinName() | ||
| + if skin_name is None: | ||
| + return | ||
| skin = queryUtility(IBrowserSkinType, name=skin_name) | ||
| if skin is not None: | ||
| layer_ifaces = [] | ||
|
|
||
|
|