Skip to content

Commit

Permalink
Drop Plone 4.3 support.
Browse files Browse the repository at this point in the history
No longer test this on Travis.
The doctest output checking was getting a bit too crazy, and not working.
  • Loading branch information
mauritsvanrees committed Aug 27, 2020
1 parent f8f4dbc commit 812de05
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 21 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -2,8 +2,6 @@ version: ~> 1.0
import: collective/buildout.plonetest:travis/default.yml
matrix:
include:
- python: "2.7"
env: PLONE_VERSION="4.3"
- python: "2.7"
env: PLONE_VERSION="5.1"
- python: "2.7"
Expand Down
2 changes: 2 additions & 0 deletions news/3130.feature
@@ -0,0 +1,2 @@
Drop Plone 4.3 support.
[maurits]
7 changes: 1 addition & 6 deletions plone/tiles/data.py
Expand Up @@ -16,6 +16,7 @@
from zope.component import queryUtility
from zope.interface import implementer
from zope.interface import Interface
from zope.interface.interfaces import ComponentLookupError
from zope.schema import getFields
from zope.schema import getFieldsInOrder
from zope.schema.interfaces import ISequence
Expand All @@ -25,12 +26,6 @@
import pkg_resources
import six

try:
from zope.interface.interfaces import ComponentLookupError
except ImportError:
# BBB for Plone 4.3
from zope.component.interfaces import ComponentLookupError


try:
pkg_resources.get_distribution('plone.rfc822')
Expand Down
4 changes: 2 additions & 2 deletions plone/tiles/data.rst
Expand Up @@ -112,12 +112,12 @@ This also applies to the value_type of a list or tuple:
>>> encode(data, IUnsupported) # doctest: +ELLIPSIS
Traceback (most recent call last):
...
ComponentLookupError: Cannot URL encode decimal of type <class 'zope.schema...Decimal'>
zope.interface.interfaces.ComponentLookupError: Cannot URL encode decimal of type <class 'zope.schema...Decimal'>
>>> encode(data, IUnsupported, ignore=('decimal',)) # doctest: +ELLIPSIS
Traceback (most recent call last):
...
ComponentLookupError: Cannot URL encode value type for list of type <class 'zope.schema._field.List'> : <class 'zope.schema...Decimal'>
zope.interface.interfaces.ComponentLookupError: Cannot URL encode value type for list of type <class 'zope.schema._field.List'> : <class 'zope.schema...Decimal'>
>>> encode(data, IUnsupported, ignore=('decimal', 'list',))
'bytes_line=abc'
Expand Down
16 changes: 6 additions & 10 deletions plone/tiles/tests/test_doctests.py
Expand Up @@ -10,17 +10,13 @@

class Py23DocChecker(doctest.OutputChecker):
def check_output(self, want, got, optionflags):
# new:
want = re.sub(
'zope.interface.interfaces.ComponentLookupError',
'ComponentLookupError',
want)
# old:
want = re.sub(
'zope.component.interfaces.ComponentLookupError',
'ComponentLookupError',
want)
if six.PY2:
# In Py 3 we get the full class path, in Py 2 only the class.
# The tests have the full path.
want = re.sub(
'zope.interface.interfaces.ComponentLookupError',
'ComponentLookupError',
want)
want = re.sub(
'zExceptions.unauthorized.Unauthorized', 'Unauthorized', want)
got = re.sub("u'(.*?)'", "'\\1'", got)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -26,7 +26,6 @@ def read(*path):
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Plone',
'Framework :: Plone :: 4.3',
'Framework :: Plone :: 5.1',
'Framework :: Plone :: 5.2',
'Framework :: Plone :: Core',
Expand Down

0 comments on commit 812de05

Please sign in to comment.