From e284f7615bc00ab9c85819c6ed7f6a80bfd2ba57 Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Tue, 21 Jan 2025 18:48:11 +0100 Subject: [PATCH] [fc] Repository: plone.distribution Branch: refs/heads/main Date: 2025-01-20T21:22:57+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.distribution/commit/95f61ba6475b2b62ede85da0032199cecc099bf1 Fix warning for unclosed file at startup. Files changed: A news/4090.bugfix M src/plone/distribution/core.py Repository: plone.distribution Branch: refs/heads/main Date: 2025-01-21T10:08:23+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.distribution/commit/36f6a55d5bde05c9e5cd1d597f9b61078297373d read schema.json bytes in one line Co-authored-by: David Glick <david@glicksoftware.com> Files changed: M src/plone/distribution/core.py Repository: plone.distribution Branch: refs/heads/main Date: 2025-01-21T18:48:11+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.distribution/commit/2608b319b1dce55067eaad03569a07d502b7dbec Merge pull request #107 from plone/maurits-warnings Fix warning for unclosed file at startup. Files changed: A news/4090.bugfix M src/plone/distribution/core.py --- last_commit.txt | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index e10f73b9fc..f662f2bebe 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,34 +1,51 @@ -Repository: plonetheme.barceloneta +Repository: plone.distribution -Branch: refs/heads/master -Date: 2025-01-20T22:24:44+01:00 +Branch: refs/heads/main +Date: 2025-01-20T21:22:57+01:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plonetheme.barceloneta/commit/39423e5ff2da2ca371387922190713bfed07cab1 +Commit: https://github.com/plone/plone.distribution/commit/95f61ba6475b2b62ede85da0032199cecc099bf1 -Fix DeprecationWarnings. +Fix warning for unclosed file at startup. Files changed: A news/4090.bugfix -M plonetheme/barceloneta/profiles/default/registry/tinymce.xml +M src/plone/distribution/core.py -b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plonetheme/barceloneta/profiles/default/registry/tinymce.xml b/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\nindex f67580d1..d865bddc 100644\n--- a/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\n+++ b/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\n@@ -1,6 +1,6 @@\n \n \n- \n \n' +b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..1ac9569\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix warning for unclosed file at startup.\ndiff --git a/src/plone/distribution/core.py b/src/plone/distribution/core.py\nindex 1bcc161..5b7f01f 100644\n--- a/src/plone/distribution/core.py\n+++ b/src/plone/distribution/core.py\n@@ -10,7 +10,8 @@\n import json\n \n \n-DEFAULT_SCHEMA = json.load(open(DEFAULT_PATH / "schema.json"))\n+with (DEFAULT_PATH / "schema.json").open() as fp:\n+ DEFAULT_SCHEMA = json.load(fp)\n DEFAULT_IMAGE = DEFAULT_PATH / "image.png"\n \n \n' -Repository: plonetheme.barceloneta +Repository: plone.distribution -Branch: refs/heads/master -Date: 2025-01-21T16:20:17+01:00 -Author: Gil Forcada Codinachs (gforcada) -Commit: https://github.com/plone/plonetheme.barceloneta/commit/5aae816ada6f367ad281709d309743893d5fc5e3 +Branch: refs/heads/main +Date: 2025-01-21T10:08:23+01:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.distribution/commit/36f6a55d5bde05c9e5cd1d597f9b61078297373d + +read schema.json bytes in one line + +Co-authored-by: David Glick <david@glicksoftware.com> + +Files changed: +M src/plone/distribution/core.py + +b'diff --git a/src/plone/distribution/core.py b/src/plone/distribution/core.py\nindex 5b7f01f..7dda1c3 100644\n--- a/src/plone/distribution/core.py\n+++ b/src/plone/distribution/core.py\n@@ -10,8 +10,7 @@\n import json\n \n \n-with (DEFAULT_PATH / "schema.json").open() as fp:\n- DEFAULT_SCHEMA = json.load(fp)\n+DEFAULT_SCHEMA = json.loads((DEFAULT_PATH / "schema.json").read_bytes())\n DEFAULT_IMAGE = DEFAULT_PATH / "image.png"\n \n \n' + +Repository: plone.distribution + + +Branch: refs/heads/main +Date: 2025-01-21T18:48:11+01:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.distribution/commit/2608b319b1dce55067eaad03569a07d502b7dbec -Merge pull request #388 from plone/maurits-warnings +Merge pull request #107 from plone/maurits-warnings -Fix DeprecationWarnings. +Fix warning for unclosed file at startup. Files changed: A news/4090.bugfix -M plonetheme/barceloneta/profiles/default/registry/tinymce.xml +M src/plone/distribution/core.py -b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plonetheme/barceloneta/profiles/default/registry/tinymce.xml b/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\nindex f67580d1..d865bddc 100644\n--- a/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\n+++ b/plonetheme/barceloneta/profiles/default/registry/tinymce.xml\n@@ -1,6 +1,6 @@\n \n \n- \n \n' +b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..1ac9569\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix warning for unclosed file at startup.\ndiff --git a/src/plone/distribution/core.py b/src/plone/distribution/core.py\nindex 1bcc161..7dda1c3 100644\n--- a/src/plone/distribution/core.py\n+++ b/src/plone/distribution/core.py\n@@ -10,7 +10,7 @@\n import json\n \n \n-DEFAULT_SCHEMA = json.load(open(DEFAULT_PATH / "schema.json"))\n+DEFAULT_SCHEMA = json.loads((DEFAULT_PATH / "schema.json").read_bytes())\n DEFAULT_IMAGE = DEFAULT_PATH / "image.png"\n \n \n'