[fc] Repository: plone.registry

Branch: refs/heads/master
Date: 2021-05-19T18:46:55+02:00
Author: Jens W. Klein (jensens) <[email protected]>
Commit: plone/plone.registry@23bdeff

Fix key validation regexp

Files changed:
A news/23.bugfix
M plone/registry/registry.py
Repository: plone.registry

Branch: refs/heads/master
Date: 2021-05-19T22:10:10+03:00
Author: Maik Derstappen (MrTango) <[email protected]>
Commit: plone/plone.registry@ac0acd9

Merge pull request #23 from plone/fix-key-validation

Fix key validation regexp

Files changed:
A news/23.bugfix
M plone/registry/registry.py

last_commit.txt

@@ -1,16 +1,34 @@
-Repository: plone.restapi
+Repository: plone.registry
 
 
 Branch: refs/heads/master
-Date: 2021-05-19T16:14:32+02:00
-Author: Timo Stollenwerk (tisto) <[email protected]>
-Commit: https://github.com/plone/plone.restapi/commit/4d280faeb4b3a24920806a746b755e728506ab54
+Date: 2021-05-19T18:46:55+02:00
+Author: Jens W. Klein (jensens) <[email protected]>
+Commit: https://github.com/plone/plone.registry/commit/23bdeff2ed601d2ec6cb8f969671496e8a306bdc
 
-Make plone-5.2.x.cfg extend versions.cfg. Remove version pins for old py/plone versions
+Fix key validation regexp
 
 Files changed:
-M plone-5.2.x.cfg
-M versions.cfg
+A news/23.bugfix
+M plone/registry/registry.py
 
-b"diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex b295494a7..b8e3d658d 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -2,28 +2,6 @@\n extends =\n     base.cfg\n     https://dist.plone.org/release/5.2.4/versions.cfg\n+    versions.cfg\n find-links += https://dist.plone.org/thirdparty/\n versions=versions\n-\n-[versions]\n-black = 20.8b1\n-\n-# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)\n-virtualenv = 20.0.35\n-\n-# Error: The requirement ('pep517>=0.9') is not allowed by your [versions] constraint (0.8.2)\n-pep517 = 0.9.1\n-\n-# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)\n-importlib-metadata = 2.0.0\n-\n-# cryptography 3.4 requires a rust compiler installed on the system:\n-# https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#34---2021-02-07\n-cryptography = 3.3.2\n-\n-# cffi 1.14.3 fails on apple m1\n-cffi = 1.14.4\n-\n-# requirement for json widget tests to pass\n-plone.schema = 1.3.0\n-plone.dexterity = 2.9.8\n\\ No newline at end of file\ndiff --git a/versions.cfg b/versions.cfg\nindex 95e18c084..28a57f557 100644\n--- a/versions.cfg\n+++ b/versions.cfg\n@@ -2,52 +2,27 @@\n # Buildout\n setuptools =\n zc.buildout =\n-zc.recipe.egg = 2.0.3\n+plone.restapi =\n \n-# fixes Getting distribution for 'configparser'. assert newdist is not None  # newloc above is missing our dist?!\n-configparser = 3.5.3\n+# code analysis\n+black = 20.8b1\n \n-# fixes Error: The requirement ('Pygments>=2.5.1') is not allowed by your [versions] constraint (2.2.0)\n-Pygments = 2.5.1\n+# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)\n+virtualenv = 20.0.35\n \n-# plone.recipe.varnish\n-plone.recipe.varnish = 1.3\n+# Error: The requirement ('pep517>=0.9') is not allowed by your [versions] constraint (0.8.2)\n+pep517 = 0.9.1\n \n-# Code-analysis\n-plone.recipe.codeanalysis = 3.0.1\n-coverage = 3.7.1\n-pep8 = 1.7.1\n-flake8 = 3.5.0\n-flake8-coding = 1.3.2\n-pycodestyle = 2.3.1\n+# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)\n+importlib-metadata = 2.0.0\n \n-# Release\n-zest.releaser = 6.17.0\n-twine = 1.11.0\n-towncrier = 19.2.0\n-zestreleaser.towncrier = 1.1.0\n-docutils = 0.13.1\n-\n-# Sphinx\n-Sphinx = 1.6.5\n-docutils = 0.14\n-Pygments = 2.2.0\n-sphinxcontrib-httpexample = 0.7.0\n-sphinxcontrib-httpdomain = 1.5.0\n-sphinx-rtd-theme = 0.2.4\n-Jinja2 = 2.10\n-Babel = 2.5.1\n-\n-# plone.rest(api) specific pins\n-\n-# Latest version compatible with Python 2\n-httpie = 1.0.3\n-\n-# Latest version compatible with Python 2\n-PyJWT = 1.7.1\n-\n-# Last version compatible with Python 2\n-pyroma = 2.6.1\n+# cryptography 3.4 requires a rust compiler installed on the system:\n+# https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#34---2021-02-07\n+cryptography = 3.3.2\n \n # cffi 1.14.3 fails on apple m1\n cffi = 1.14.4\n+\n+# requirement for json widget tests to pass\n+plone.schema = 1.3.0\n+plone.dexterity = 2.9.8\n\\ No newline at end of file\n"
+b'diff --git a/news/23.bugfix b/news/23.bugfix\nnew file mode 100644\nindex 0000000..366cc44\n--- /dev/null\n+++ b/news/23.bugfix\n@@ -0,0 +1,2 @@\n+Fix registry key validation regexp.\n+[jensens]\n\\ No newline at end of file\ndiff --git a/plone/registry/registry.py b/plone/registry/registry.py\nindex cfaf0da..c14f5d1 100644\n--- a/plone/registry/registry.py\n+++ b/plone/registry/registry.py\n@@ -172,12 +172,9 @@ class _Records(object):\n \n     # Similar to zope.schema._field._isdotted, but allows up to one \'/\'\n     _validkey = re.compile(\n-        r"([a-zA-Z][a-zA-Z0-9_-]*)"\n-        r"([.][a-zA-Z][a-zA-Z0-9_-]*)*"\n-        r"([/][a-zA-Z][a-zA-Z0-9_-]*)?"\n-        r"([.][a-zA-Z][a-zA-Z0-9_-]*)*"\n-        # use the whole line\n-        r"$").match\n+        r"([a-zA-Z][a-zA-Z0-9_-]*)((?:\\.[a-zA-Z0-9][a-zA-Z0-9_-]*)*)"\n+        r"([/][a-zA-Z0-9][a-zA-Z0-9_-]*)?((?:\\.[a-zA-Z0-9][a-zA-Z0-9_-]*)*)$"\n+    ).match\n \n     def __init__(self, parent):\n         self.__parent__ = parent\n'
+
+Repository: plone.registry
+
+
+Branch: refs/heads/master
+Date: 2021-05-19T22:10:10+03:00
+Author: Maik Derstappen (MrTango) <[email protected]>
+Commit: https://github.com/plone/plone.registry/commit/ac0acd907ee1a22166a990783de1334762013b2b
+
+Merge pull request #23 from plone/fix-key-validation
+
+Fix key validation regexp
+
+Files changed:
+A news/23.bugfix
+M plone/registry/registry.py
+
+b'diff --git a/news/23.bugfix b/news/23.bugfix\nnew file mode 100644\nindex 0000000..366cc44\n--- /dev/null\n+++ b/news/23.bugfix\n@@ -0,0 +1,2 @@\n+Fix registry key validation regexp.\n+[jensens]\n\\ No newline at end of file\ndiff --git a/plone/registry/registry.py b/plone/registry/registry.py\nindex cfaf0da..c14f5d1 100644\n--- a/plone/registry/registry.py\n+++ b/plone/registry/registry.py\n@@ -172,12 +172,9 @@ class _Records(object):\n \n     # Similar to zope.schema._field._isdotted, but allows up to one \'/\'\n     _validkey = re.compile(\n-        r"([a-zA-Z][a-zA-Z0-9_-]*)"\n-        r"([.][a-zA-Z][a-zA-Z0-9_-]*)*"\n-        r"([/][a-zA-Z][a-zA-Z0-9_-]*)?"\n-        r"([.][a-zA-Z][a-zA-Z0-9_-]*)*"\n-        # use the whole line\n-        r"$").match\n+        r"([a-zA-Z][a-zA-Z0-9_-]*)((?:\\.[a-zA-Z0-9][a-zA-Z0-9_-]*)*)"\n+        r"([/][a-zA-Z0-9][a-zA-Z0-9_-]*)?((?:\\.[a-zA-Z0-9][a-zA-Z0-9_-]*)*)$"\n+    ).match\n \n     def __init__(self, parent):\n         self.__parent__ = parent\n'