buildout.coredev/5.1: Merge branch '5.1' of github.com:plone/buildout.coredev into
Alexander Loechel <jenkins-z4DKO/[email protected]>
| Newsgroups | gmane.comp.web.zope.plone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Repository: buildout.coredev Branch: refs/heads/5.1 Date: 2017-07-20T00:18:14+02:00 Author: Alexander Loechel (loechel) <[email protected]> Commit: https://github.com/plone/buildout.coredev/commit/480f6e85bbd23f585dac0a669447c4ceb50fcada Merge branch '5.1' of github.com:plone/buildout.coredev into 5.1 Files changed: M last_commit.txt diff --git a/last_commit.txt b/last_commit.txt index cb63c9ca4..f3b9a2d89 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,100 +1,69 @@ -Repository: plone.app.upgrade +Repository: plone.app.multilingual Branch: refs/heads/master -Date: 2017-07-19T15:03:30+02:00 -Author: Jens W. Klein (jensens) <jk-jUMamYRpa/IasaSY4/nUZ7NldLUNz+W/@public.gmane.org> -Commit: https://github.com/plone/plone.app.upgrade/commit/9f99dae94cf966b70c57175b7b69d8b1fc544ba5 +Date: 2017-07-20T00:12:29+02:00 +Author: Gil Forcada Codinachs (gforcada) <[email protected]> +Commit: https://github.com/plone/plone.app.multilingual/commit/5914ae75a156b69d5e1297037aa5923961616154 -fixes #84 - bug while migration, aq_base function works - -Files changed: -M CHANGES.rst -M plone/app/upgrade/v50/final.py - -diff --git a/CHANGES.rst b/CHANGES.rst -index 9785daa..266a629 100644 ---- a/CHANGES.rst -+++ b/CHANGES.rst -@@ -15,7 +15,8 @@ New features: - - Bug fixes: - --- *add item here* -+- Fix #84 - usage of aq_base -+ [jensens] - - - 2.0.5 (2017-07-03) -diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py -index 57a6478..0f4b44a 100644 ---- a/plone/app/upgrade/v50/final.py -+++ b/plone/app/upgrade/v50/final.py -@@ -1,4 +1,5 @@ - # -*- coding: utf-8 -*- -+from Acquisition import aq_base - from plone.app.upgrade.utils import loadMigrationProfile - from plone.registry.interfaces import IRegistry - from Products.CMFCore.utils import getToolByName -@@ -70,7 +71,7 @@ def refresh_getIcon_catalog_metadata(context): - for brain in zcatalog.unrestrictedSearchResults(): - # First get the new value - obj = brain._unrestrictedGetObject() -- new_value = bool(getattr(obj.aq_base, 'image', False)) -+ new_value = bool(getattr(aq_base(obj), 'image', False)) - - # We can now update the record with the new getIcon value - record = list(catalog.data[brain.getRID()]) +[cleanup] Fix imports order and quotes - -Repository: plone.app.upgrade - - -Branch: refs/heads/master -Date: 2017-07-19T18:44:25+02:00 -Author: agitator (agitator) <[email protected]> -Commit: https://github.com/plone/plone.app.upgrade/commit/bdd0f9532ae0dca6fd47d56f9bb3d5ef0a05365c - -Merge pull request #128 from plone/fix-84 - -fixes #84 - bug while migration, aq_base function works +Stupid change to test recent changes on mr.roboto Files changed: -M CHANGES.rst -M plone/app/upgrade/v50/final.py +M setup.py -diff --git a/CHANGES.rst b/CHANGES.rst -index 9785daa..266a629 100644 ---- a/CHANGES.rst -+++ b/CHANGES.rst -@@ -15,7 +15,8 @@ New features: - - Bug fixes: - --- *add item here* -+- Fix #84 - usage of aq_base -+ [jensens] +diff --git a/setup.py b/setup.py +index 798a64cd..79a9a7dd 100755 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,8 @@ + """Setup plone.app.multilingual.""" ++from setuptools import find_packages ++from setuptools import setup + import os +-from setuptools import setup, find_packages - 2.0.5 (2017-07-03) -diff --git a/plone/app/upgrade/v50/final.py b/plone/app/upgrade/v50/final.py -index 57a6478..0f4b44a 100644 ---- a/plone/app/upgrade/v50/final.py -+++ b/plone/app/upgrade/v50/final.py -@@ -1,4 +1,5 @@ - # -*- coding: utf-8 -*- -+from Acquisition import aq_base - from plone.app.upgrade.utils import loadMigrationProfile - from plone.registry.interfaces import IRegistry - from Products.CMFCore.utils import getToolByName -@@ -70,7 +71,7 @@ def refresh_getIcon_catalog_metadata(context): - for brain in zcatalog.unrestrictedSearchResults(): - # First get the new value - obj = brain._unrestrictedGetObject() -- new_value = bool(getattr(obj.aq_base, 'image', False)) -+ new_value = bool(getattr(aq_base(obj), 'image', False)) - # We can now update the record with the new getIcon value - record = list(catalog.data[brain.getRID()]) + version = '5.1.1.dev0' +@@ -9,24 +10,24 @@ + setup( + name='plone.app.multilingual', + version=version, +- description="Multilingual Plone UI package, enables maintenance of " +- "translations for both Dexterity types and Archetypes", +- long_description="\n\n".join([ +- open("README.rst").read(), +- open(os.path.join("docs", "CREDITS.txt")).read(), +- open("CHANGES.rst").read(), ++ description='Multilingual Plone UI package, enables maintenance of ' ++ 'translations for both Dexterity types and Archetypes', ++ long_description='\n\n'.join([ ++ open('README.rst').read(), ++ open(os.path.join('docs', 'CREDITS.txt')).read(), ++ open('CHANGES.rst').read(), + ]), + classifiers=[ +- "Framework :: Plone", +- "Framework :: Plone :: 5.0", +- "Framework :: Plone :: 5.1", +- "Programming Language :: Python", +- "Programming Language :: Python :: 2.7", +- "Topic :: Software Development :: Libraries :: Python Modules", ++ 'Framework :: Plone', ++ 'Framework :: Plone :: 5.0', ++ 'Framework :: Plone :: 5.1', ++ 'Programming Language :: Python', ++ 'Programming Language :: Python :: 2.7', ++ 'Topic :: Software Development :: Libraries :: Python Modules', + ], + url='https://github.com/plone/plone.app.multilingual', + license='GPL', +- keywords="language multilingual content", ++ keywords='language multilingual content', + author='Ramon Navarro, Victor Fernandez de Alba, awello et al', + author_email='[email protected]', + packages=find_packages('src'), ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot