-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.app.contenttypes
Branch: refs/heads/master Date: 2017-07-14T13:23:49+02:00 Author: Gil Forcada (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.app.contenttypes@81b2391 Remove plone.app.robotframework 'reload' extra Related to plone/Products.CMFPlone#2104 Files changed: M CHANGES.rst M setup.py Repository: plone.app.contenttypes Branch: refs/heads/master Date: 2017-07-17T10:21:05+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.contenttypes@b2dbc6e Merge pull request #416 from plone/gforcada-remove-reload-extra Remove plone.app.robotframework 'reload' extra Files changed: M CHANGES.rst M setup.py
- Loading branch information
Showing
1 changed file
with
59 additions
and
57 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,88 +1,90 @@ | ||
| Repository: plone.app.contentrules | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-07-15T17:28:02+02:00 | ||
| Author: Peter Holzer (agitator) <peter.holzer@agitator.com> | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/5d69a880c611eda5ef7a7af0fe66088ded9dad1e | ||
| Date: 2017-07-14T13:23:49+02:00 | ||
| Author: Gil Forcada (gforcada) <gil.gnome@gmail.com> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/81b2391644a4f8de6e4fe802c3a4b03cf47bb288 | ||
|
|
||
| Fix UnicodeEncodeError if portal from name contains Umlauts | ||
| Remove plone.app.robotframework 'reload' extra | ||
|
|
||
| Related to https://github.com/plone/Products.CMFPlone/issues/2104 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/contentrules/actions/mail.py | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index b35566a..43e880c 100644 | ||
| index c37b028b..23cb51f9 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Fix UnicodeEncodeError if portal from name contains Umlauts | ||
| + [agitator] | ||
|
|
||
|
|
||
| 4.0.16 (2017-05-23) | ||
| diff --git a/plone/app/contentrules/actions/mail.py b/plone/app/contentrules/actions/mail.py | ||
| index 601820b..320a76b 100644 | ||
| --- a/plone/app/contentrules/actions/mail.py | ||
| +++ b/plone/app/contentrules/actions/mail.py | ||
| @@ -131,7 +131,7 @@ def __call__(self): | ||
| return False | ||
| @@ -24,6 +24,9 @@ Bug fixes: | ||
| - Actually migrate all migratable types when passing 'all' to at-dx migration. | ||
| [pbauer] | ||
|
|
||
| from_name = self.mail_settings.email_from_name.strip('"') | ||
| - source = '"{0}" <{1}>'.format(from_name, from_address) | ||
| + source = '"{0}" <{1}>'.format(from_name.encode('utf8'), from_address) | ||
| +- Remove plone.app.robotframework 'reload' extra. | ||
| + This allows to remove quite some other external dependencies that are not Python 3 compatible. | ||
| + [gforcada] | ||
|
|
||
| recip_string = interpolator(self.element.recipients) | ||
| if recip_string: # check recipient is not None or empty string | ||
| 1.4.1 (2017-07-03) | ||
| ------------------ | ||
| diff --git a/setup.py b/setup.py | ||
| index d855088b..eee13ef2 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -58,7 +58,7 @@ def read(*rnames): | ||
| 'test': [ | ||
| 'archetypes.schemaextender', | ||
| 'lxml', | ||
| - 'plone.app.robotframework [debug, reload] > 0.9.8', # create image and file content for Image, File and News Item if not given. # noqa | ||
| + 'plone.app.robotframework [debug] > 0.9.8', # create image and file content for Image, File and News Item if not given. # noqa | ||
| 'plone.app.testing [robot] >= 4.2.4', # we need ROBOT_TEST_LEVEL | ||
| # 'plone.dexterity >= 2.3.0', # fixes setting default values # NOT RELEASED YET. # noqa | ||
| 'Products.ATContentTypes', | ||
|
|
||
|
|
||
| Repository: plone.app.contentrules | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2017-07-16T00:08:08+02:00 | ||
| Author: Johannes Raggam (thet) <thetetet@gmail.com> | ||
| Commit: https://github.com/plone/plone.app.contentrules/commit/51d02a6c7fb540c562ca71b65d31b4e9842d1379 | ||
| Date: 2017-07-17T10:21:05+02:00 | ||
| Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/b2dbc6e0d196218b64164cea0c9e0eb93e9e7aab | ||
|
|
||
| Merge pull request #33 from plone/fix32 | ||
| Merge pull request #416 from plone/gforcada-remove-reload-extra | ||
|
|
||
| Fix UnicodeEncodeError if portal from name contains Umlauts | ||
| Remove plone.app.robotframework 'reload' extra | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/contentrules/actions/mail.py | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index b35566a..43e880c 100644 | ||
| index c37b028b..23cb51f9 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -14,7 +14,8 @@ New features: | ||
|
|
||
| Bug fixes: | ||
|
|
||
| -- *add item here* | ||
| +- Fix UnicodeEncodeError if portal from name contains Umlauts | ||
| + [agitator] | ||
|
|
||
|
|
||
| 4.0.16 (2017-05-23) | ||
| diff --git a/plone/app/contentrules/actions/mail.py b/plone/app/contentrules/actions/mail.py | ||
| index 601820b..320a76b 100644 | ||
| --- a/plone/app/contentrules/actions/mail.py | ||
| +++ b/plone/app/contentrules/actions/mail.py | ||
| @@ -131,7 +131,7 @@ def __call__(self): | ||
| return False | ||
| @@ -24,6 +24,9 @@ Bug fixes: | ||
| - Actually migrate all migratable types when passing 'all' to at-dx migration. | ||
| [pbauer] | ||
|
|
||
| from_name = self.mail_settings.email_from_name.strip('"') | ||
| - source = '"{0}" <{1}>'.format(from_name, from_address) | ||
| + source = '"{0}" <{1}>'.format(from_name.encode('utf8'), from_address) | ||
| +- Remove plone.app.robotframework 'reload' extra. | ||
| + This allows to remove quite some other external dependencies that are not Python 3 compatible. | ||
| + [gforcada] | ||
|
|
||
| recip_string = interpolator(self.element.recipients) | ||
| if recip_string: # check recipient is not None or empty string | ||
| 1.4.1 (2017-07-03) | ||
| ------------------ | ||
| diff --git a/setup.py b/setup.py | ||
| index d855088b..eee13ef2 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -58,7 +58,7 @@ def read(*rnames): | ||
| 'test': [ | ||
| 'archetypes.schemaextender', | ||
| 'lxml', | ||
| - 'plone.app.robotframework [debug, reload] > 0.9.8', # create image and file content for Image, File and News Item if not given. # noqa | ||
| + 'plone.app.robotframework [debug] > 0.9.8', # create image and file content for Image, File and News Item if not given. # noqa | ||
| 'plone.app.testing [robot] >= 4.2.4', # we need ROBOT_TEST_LEVEL | ||
| # 'plone.dexterity >= 2.3.0', # fixes setting default values # NOT RELEASED YET. # noqa | ||
| 'Products.ATContentTypes', | ||
|
|
||
|
|