-
-
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.
Branch: refs/heads/master Date: 2018-10-05T23:45:40-04:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.dexterity@ccdec8b encode unicode message as utf-8, not default encoding Files changed: M plone/dexterity/filerepresentation.py Repository: plone.dexterity Branch: refs/heads/master Date: 2018-10-06T08:43:31-04:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.dexterity@a7523ae Merge pull request #91 from plone/fix-message-encoding encode unicode message as utf-8, not default encoding Files changed: M plone/dexterity/filerepresentation.py
- Loading branch information
davisagli
committed
Oct 6, 2018
1 parent
46ab8c9
commit 5563f13
Showing
1 changed file
with
15 additions
and
19 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,36 +1,32 @@ | ||
Repository: Products.Archetypes | ||
Repository: plone.dexterity | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2018-10-04T13:43:48+02:00 | ||
Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> | ||
Commit: https://github.com/plone/Products.Archetypes/commit/4220b872b08a5ab3b7303c20ab040af5d778ee48 | ||
Date: 2018-10-05T23:45:40-04:00 | ||
Author: David Glick (davisagli) <david@glicksoftware.com> | ||
Commit: https://github.com/plone/plone.dexterity/commit/ccdec8bc9160b3813c9b2515a6d950a157c53c5f | ||
|
||
Removed travis config. Jenkins is used instead. #116 | ||
encode unicode message as utf-8, not default encoding | ||
|
||
Files changed: | ||
A news/116.feature | ||
D .travis.yml | ||
D travis.cfg | ||
M plone/dexterity/filerepresentation.py | ||
|
||
b"diff --git a/.travis.yml b/.travis.yml\ndeleted file mode 100644\nindex cfe1c892..00000000\n--- a/.travis.yml\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-language: python\n-python: 2.7\n-sudo: false\n-cache:\n- pip: true\n- directories:\n- - $HOME/buildout-cache\n-before_install:\n- - mkdir -p $HOME/buildout-cache/{eggs,downloads}\n- - python -m pip install -U pip virtualenv\n- - python -m virtualenv .\n-# Keep in sync with buildout.cfg:\n- - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3\n-install:\n- - bin/python -V\n- - bin/buildout -Nvt 5 -c travis.cfg annotate\n- - bin/buildout -Nvt 5 -c travis.cfg\n-script:\n- - bin/test -vc\ndiff --git a/news/116.feature b/news/116.feature\nnew file mode 100644\nindex 00000000..e0990c05\n--- /dev/null\n+++ b/news/116.feature\n@@ -0,0 +1 @@\n+Removed travis config. Jenkins is used instead.\ndiff --git a/travis.cfg b/travis.cfg\ndeleted file mode 100644\nindex 1603b236..00000000\n--- a/travis.cfg\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-[buildout]\n-extends = buildout.cfg\n-\n-# caches, see also .travis.yaml\n-# one should not depend on '/home/travis' but it seems stable in containers.\n-eggs-directory = /home/travis/buildout-cache/eggs\n-download-cache = /home/travis/buildout-cache/downloads\n" | ||
b"diff --git a/plone/dexterity/filerepresentation.py b/plone/dexterity/filerepresentation.py\nindex 22e0c6f..9ebf6e5 100644\n--- a/plone/dexterity/filerepresentation.py\n+++ b/plone/dexterity/filerepresentation.py\n@@ -690,10 +690,10 @@ def _getStream(self):\n message = self._getMessage()\n if six.PY2:\n # message.as_string will return str in both Python 2 and 3\n- mode = 'w+b'\n+ kw = {'mode': 'w+b'}\n else:\n- mode = 'w+'\n- out = tempfile.TemporaryFile(mode=mode)\n+ kw = {'mode': 'w+', 'encoding': 'utf-8'}\n+ out = tempfile.TemporaryFile(**kw)\n out.write(message.as_string())\n self._size = out.tell()\n out.seek(0)\n" | ||
|
||
Repository: Products.Archetypes | ||
Repository: plone.dexterity | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2018-10-06T11:54:00+02:00 | ||
Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
Commit: https://github.com/plone/Products.Archetypes/commit/63ae9d1c13586ef7a516777fda73215848386a28 | ||
Date: 2018-10-06T08:43:31-04:00 | ||
Author: David Glick (davisagli) <[email protected]> | ||
Commit: https://github.com/plone/plone.dexterity/commit/a7523ae306ae541724438f68b40fc7238ac31e1e | ||
|
||
Merge pull request #117 from plone/116-remove-travis | ||
Merge pull request #91 from plone/fix-message-encoding | ||
|
||
Removed travis config | ||
encode unicode message as utf-8, not default encoding | ||
|
||
Files changed: | ||
A news/116.feature | ||
D .travis.yml | ||
D travis.cfg | ||
M plone/dexterity/filerepresentation.py | ||
|
||
b"diff --git a/.travis.yml b/.travis.yml\ndeleted file mode 100644\nindex cfe1c892..00000000\n--- a/.travis.yml\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-language: python\n-python: 2.7\n-sudo: false\n-cache:\n- pip: true\n- directories:\n- - $HOME/buildout-cache\n-before_install:\n- - mkdir -p $HOME/buildout-cache/{eggs,downloads}\n- - python -m pip install -U pip virtualenv\n- - python -m virtualenv .\n-# Keep in sync with buildout.cfg:\n- - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3\n-install:\n- - bin/python -V\n- - bin/buildout -Nvt 5 -c travis.cfg annotate\n- - bin/buildout -Nvt 5 -c travis.cfg\n-script:\n- - bin/test -vc\ndiff --git a/news/116.feature b/news/116.feature\nnew file mode 100644\nindex 00000000..e0990c05\n--- /dev/null\n+++ b/news/116.feature\n@@ -0,0 +1 @@\n+Removed travis config. Jenkins is used instead.\ndiff --git a/travis.cfg b/travis.cfg\ndeleted file mode 100644\nindex 1603b236..00000000\n--- a/travis.cfg\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-[buildout]\n-extends = buildout.cfg\n-\n-# caches, see also .travis.yaml\n-# one should not depend on '/home/travis' but it seems stable in containers.\n-eggs-directory = /home/travis/buildout-cache/eggs\n-download-cache = /home/travis/buildout-cache/downloads\n" | ||
b"diff --git a/plone/dexterity/filerepresentation.py b/plone/dexterity/filerepresentation.py\nindex 22e0c6f..9ebf6e5 100644\n--- a/plone/dexterity/filerepresentation.py\n+++ b/plone/dexterity/filerepresentation.py\n@@ -690,10 +690,10 @@ def _getStream(self):\n message = self._getMessage()\n if six.PY2:\n # message.as_string will return str in both Python 2 and 3\n- mode = 'w+b'\n+ kw = {'mode': 'w+b'}\n else:\n- mode = 'w+'\n- out = tempfile.TemporaryFile(mode=mode)\n+ kw = {'mode': 'w+', 'encoding': 'utf-8'}\n+ out = tempfile.TemporaryFile(**kw)\n out.write(message.as_string())\n self._size = out.tell()\n out.seek(0)\n" | ||
|