Skip to content

Commit

Permalink
[fc] Repository: plone.app.viewletmanager
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2018-10-18T17:06:19+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.viewletmanager@a8c3a8c

fix another TypeError

Files changed:
M CHANGES.rst
M plone/app/viewletmanager/manager.py
Repository: plone.app.viewletmanager

Branch: refs/heads/master
Date: 2018-10-18T22:18:02+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.viewletmanager@f5d9e83

Merge pull request #18 from plone/fix_sorting

fix another TypeError

Files changed:
M CHANGES.rst
M plone/app/viewletmanager/manager.py
  • Loading branch information
@pbauer
pbauer committed Oct 18, 2018
1 parent b16b91a commit 3fb7699
Showing 1 changed file with 15 additions and 33 deletions.
48 changes: 15 additions & 33 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,34 @@
Repository: plonetheme.barceloneta
Repository: plone.app.viewletmanager


Branch: refs/heads/master
Date: 2018-10-18T08:53:28+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plonetheme.barceloneta/commit/cdb498daf88a81da82bdb3a48ecb42f7ae7fa75d
Date: 2018-10-18T17:06:19+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.app.viewletmanager/commit/a8c3a8ccfce5172d12b81079104c8785319d71e9

Remove colophon and copyright in theme, if not present in content

and also bump version because of breaking changes
fix another TypeError

Files changed:
M CHANGES.rst
M plonetheme/barceloneta/theme/rules.xml

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 17b0cce..612e68f 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -2,8 +2,8 @@ Changelog\n =========\n \n \n-1.9.2 (unreleased)\n-------------------\n+1.10.0 (unreleased)\n+-------------------\n \n Breaking changes:\n \ndiff --git a/plonetheme/barceloneta/theme/rules.xml b/plonetheme/barceloneta/theme/rules.xml\nindex 4bde66f..df9f838 100644\n--- a/plonetheme/barceloneta/theme/rules.xml\n+++ b/plonetheme/barceloneta/theme/rules.xml\n@@ -111,12 +111,14 @@\n css:theme-children="#portal-footer .copyright > div"\n css:content-children="#portal-footer-wrapper #portal-footer-signature .portletContent"\n />\n+ <drop css:theme="#portal-footer .copyright" css:if-not-content="#portal-footer-wrapper #portal-footer-signature" />\n \n <!-- Replace colophon information with Plone version. -->\n <replace\n css:theme-children="#portal-footer .colophon > div"\n css:content-children="#portal-footer-wrapper #portal-colophon .portletContent"\n />\n+ <drop css:theme="#portal-footer .colophon" css:if-not-content="#portal-footer-wrapper #portal-colophon" />\n \n <!-- Replace site-actions with Plone version. -->\n <replace\n'

Repository: plonetheme.barceloneta


Branch: refs/heads/master
Date: 2018-10-18T08:54:02+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plonetheme.barceloneta/commit/2f7a1c80331b50b2a1ef7b5e019dfe326efc4cfb

increase version in setup.py

Files changed:
M setup.py
M plone/app/viewletmanager/manager.py

b"diff --git a/setup.py b/setup.py\nindex 7d0a1af..c505435 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -5,7 +5,7 @@\n def read(*rnames):\n return open(os.path.join(os.path.dirname(__file__), *rnames)).read()\n \n-version = '1.9.2.dev0'\n+version = '1.10.0.dev0'\n \n long_description = (\n read('README.rst') + '\\n' +\n"
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 73da396..135049f 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -24,7 +24,7 @@ Bug fixes:\n \n - Tests are compliant with Products.GenericSetup >= 2.0\n \n-- Fix TypeError when comparing some viewlet-types in py3.\n+- Fix TypeErrors when comparing some viewlet-types in py3.\n [pbauer]\n \n \ndiff --git a/plone/app/viewletmanager/manager.py b/plone/app/viewletmanager/manager.py\nindex 9f65f25..54b7bcf 100644\n--- a/plone/app/viewletmanager/manager.py\n+++ b/plone/app/viewletmanager/manager.py\n@@ -236,8 +236,10 @@ def _getOrder(self, manager_name):\n \n # then sort the remaining ones\n # Copied from Five\n- remaining = sorted(name_map.items(),\n- lambda x, y: cmp(aq_base(x[1]), aq_base(y[1])))\n+ try:\n+ remaining = sorted(name_map.items(), key=lambda x: aq_base(x[1]))\n+ except:\n+ remaining = sorted(name_map.items(), key=itemgetter(0))\n \n return [x[0] for x in result + remaining]\n \n'

Repository: plonetheme.barceloneta
Repository: plone.app.viewletmanager


Branch: refs/heads/master
Date: 2018-10-18T16:16:04+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plonetheme.barceloneta/commit/ac6ba1198ed9136493c741b49ab1294ab0f1744b
Date: 2018-10-18T22:18:02+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.app.viewletmanager/commit/f5d9e83bdd49311747e7b52f8e1b3d651a977eec

Merge pull request #166 from plone/footer-rules-fix
Merge pull request #18 from plone/fix_sorting

Update footer rules
fix another TypeError

Files changed:
M CHANGES.rst
M plonetheme/barceloneta/theme/rules.xml
M setup.py
M plone/app/viewletmanager/manager.py

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 17b0cce..612e68f 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -2,8 +2,8 @@ Changelog\n =========\n \n \n-1.9.2 (unreleased)\n-------------------\n+1.10.0 (unreleased)\n+-------------------\n \n Breaking changes:\n \ndiff --git a/plonetheme/barceloneta/theme/rules.xml b/plonetheme/barceloneta/theme/rules.xml\nindex 4bde66f..df9f838 100644\n--- a/plonetheme/barceloneta/theme/rules.xml\n+++ b/plonetheme/barceloneta/theme/rules.xml\n@@ -111,12 +111,14 @@\n css:theme-children="#portal-footer .copyright > div"\n css:content-children="#portal-footer-wrapper #portal-footer-signature .portletContent"\n />\n+ <drop css:theme="#portal-footer .copyright" css:if-not-content="#portal-footer-wrapper #portal-footer-signature" />\n \n <!-- Replace colophon information with Plone version. -->\n <replace\n css:theme-children="#portal-footer .colophon > div"\n css:content-children="#portal-footer-wrapper #portal-colophon .portletContent"\n />\n+ <drop css:theme="#portal-footer .colophon" css:if-not-content="#portal-footer-wrapper #portal-colophon" />\n \n <!-- Replace site-actions with Plone version. -->\n <replace\ndiff --git a/setup.py b/setup.py\nindex 7d0a1af..c505435 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -5,7 +5,7 @@\n def read(*rnames):\n return open(os.path.join(os.path.dirname(__file__), *rnames)).read()\n \n-version = \'1.9.2.dev0\'\n+version = \'1.10.0.dev0\'\n \n long_description = (\n read(\'README.rst\') + \'\\n\' +\n'
b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 73da396..135049f 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -24,7 +24,7 @@ Bug fixes:\n \n - Tests are compliant with Products.GenericSetup >= 2.0\n \n-- Fix TypeError when comparing some viewlet-types in py3.\n+- Fix TypeErrors when comparing some viewlet-types in py3.\n [pbauer]\n \n \ndiff --git a/plone/app/viewletmanager/manager.py b/plone/app/viewletmanager/manager.py\nindex 9f65f25..54b7bcf 100644\n--- a/plone/app/viewletmanager/manager.py\n+++ b/plone/app/viewletmanager/manager.py\n@@ -236,8 +236,10 @@ def _getOrder(self, manager_name):\n \n # then sort the remaining ones\n # Copied from Five\n- remaining = sorted(name_map.items(),\n- lambda x, y: cmp(aq_base(x[1]), aq_base(y[1])))\n+ try:\n+ remaining = sorted(name_map.items(), key=lambda x: aq_base(x[1]))\n+ except:\n+ remaining = sorted(name_map.items(), key=itemgetter(0))\n \n return [x[0] for x in result + remaining]\n \n'

0 comments on commit 3fb7699

Please sign in to comment.