ajung/plone.app.discussion
ajung
/
plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into filippo_moderation_js

This commit is contained in:
Filippo Campi 2018-10-25 00:32:28 +02:00
parent 7bd62fa1cb 069b0c4b94
commit c61da98dac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@ -27,7 +27,7 @@ Bug fixes:
[iham] [iham]
- Fix commenting and tests in python 3. - Fix commenting and tests in python 3.
[pbauer] [pbauer, jensens]
3.0.6 (2018-06-18) 3.0.6 (2018-06-18)
------------------ ------------------

5
plone/app/discussion/tests/test_catalog.py
View File

@ -204,7 +204,10 @@ class ConversationCatalogTest(unittest.TestCase):
) )
doc1_brain = brains[0] doc1_brain = brains[0]
self.assertEqual(doc1_brain.commentators, ('Jim', 'Emma')) self.assertEqual(
sorted(doc1_brain.commentators),
sorted(('Jim', 'Emma')),
)
# remove one comments # remove one comments
del self.conversation[new_comment2_id] del self.conversation[new_comment2_id]

4
setup.py
View File

@ -47,9 +47,9 @@ setup(name='plone.app.discussion',
keywords='plone discussion', keywords='plone discussion',
author='Timo Stollenwerk - Plone Foundation', author='Timo Stollenwerk - Plone Foundation',
author_email='plone-developers@lists.sourceforge.net', author_email='plone-developers@lists.sourceforge.net',
url='https://pypi.python.org/pypi/plone.app.discussion', url='https://pypi.org/project/plone.app.discussion',
license='GPL', license='GPL',
packages=find_packages(exclude=['ez_setup']), packages=find_packages(),
namespace_packages=['plone', 'plone.app'], namespace_packages=['plone', 'plone.app'],
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,