-
-
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: Products.MimetypesRegistry
Branch: refs/heads/master Date: 2020-09-09T23:13:15+02:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/Products.MimetypesRegistry@d241e79 Fixed invalid escape sequences. Note that only some are for regular expressions (only one of them being reported as having an invalid escape sequence). The others are strings (well, bytes) used in a different way. It is very hard to see whether the magic mimetype changes are okay. For the first one, starting with 8BPS, for x-psd, I have found it in /usr/share/mime on Ubuntu 18.04, but even then I am not entirely sure it is correct. I could not find the others in there, but they do seem safer, as they are actually the same. For example: b'<smil\>' == br'<smil\>' Files changed: A news/3130.bugfix M Products/MimetypesRegistry/encoding.py M Products/MimetypesRegistry/mime_types/magic.py Repository: Products.MimetypesRegistry Branch: refs/heads/master Date: 2020-09-10T10:54:10+02:00 Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> Commit: plone/Products.MimetypesRegistry@89ff100 Merge pull request #18 from plone/maurits/fix-warnings Fixed invalid escape sequences. Files changed: A news/3130.bugfix M Products/MimetypesRegistry/encoding.py M Products/MimetypesRegistry/mime_types/magic.py
- Loading branch information
Showing
1 changed file
with
24 additions
and
26 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,50 +1,48 @@ | ||
| Repository: plone.portlet.static | ||
| Repository: Products.MimetypesRegistry | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2020-09-09T23:19:21+02:00 | ||
| Date: 2020-09-09T23:13:15+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/de7e19dda4138804599db459a1abc11d88abe973 | ||
| Commit: https://github.com/plone/Products.MimetypesRegistry/commit/d241e79d078ff39d7b412d7851771d06ca1e454e | ||
|
|
||
| Fixed invalid escape sequence | ||
| Fixed invalid escape sequences. | ||
|
|
||
| Files changed: | ||
| A news/3130.bugfix | ||
| M plone/portlet/static/static.py | ||
| Note that only some are for regular expressions (only one of them being reported as having an invalid escape sequence). | ||
| The others are strings (well, bytes) used in a different way. | ||
|
|
||
| b'diff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..8c80dfd\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed invalid escape sequence.\n+[maurits]\ndiff --git a/plone/portlet/static/static.py b/plone/portlet/static/static.py\nindex 35ca86d..95127d3 100644\n--- a/plone/portlet/static/static.py\n+++ b/plone/portlet/static/static.py\n@@ -64,7 +64,7 @@ class IStaticPortlet(IPortletDataProvider):\n header = schema.TextLine(\n title=_(u"Portlet header"),\n description=_(u"Title of the rendered portlet"),\n- constraint=re.compile("[^\\s]").match,\n+ constraint=re.compile(r"[^\\s]").match,\n required=False)\n \n directives.widget(text=RichTextFieldWidget)\n' | ||
| It is very hard to see whether the magic mimetype changes are okay. | ||
| For the first one, starting with 8BPS, for x-psd, I have found it in /usr/share/mime on Ubuntu 18.04, | ||
| but even then I am not entirely sure it is correct. | ||
|
|
||
| Repository: plone.portlet.static | ||
| I could not find the others in there, but they do seem safer, as they are actually the same. | ||
| For example: | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2020-09-09T23:23:16+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/c0ca159317b4e361bbd5d766b5990559e973df26 | ||
|
|
||
| Fixed deprecated assert functions in tests. | ||
| b'<smil\>' == br'<smil\>' | ||
|
|
||
| Files changed: | ||
| M plone/portlet/static/tests/test_portlet_static.py | ||
| A news/3130.bugfix | ||
| M Products/MimetypesRegistry/encoding.py | ||
| M Products/MimetypesRegistry/mime_types/magic.py | ||
|
|
||
| b'diff --git a/plone/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py\nindex 2c217ba..8a01011 100644\n--- a/plone/portlet/static/tests/test_portlet_static.py\n+++ b/plone/portlet/static/tests/test_portlet_static.py\n@@ -26,12 +26,12 @@ def setUp(self):\n \n def testPortletTypeRegistered(self):\n portlet = getUtility(IPortletType, name=\'plone.portlet.static.Static\')\n- self.assertEquals(portlet.addview, \'plone.portlet.static.Static\')\n+ self.assertEqual(portlet.addview, \'plone.portlet.static.Static\')\n \n def testInterfaces(self):\n portlet = static.Assignment(header=u"title", text="text")\n- self.failUnless(IPortletAssignment.providedBy(portlet))\n- self.failUnless(IPortletDataProvider.providedBy(portlet.data))\n+ self.assertTrue(IPortletAssignment.providedBy(portlet))\n+ self.assertTrue(IPortletDataProvider.providedBy(portlet.data))\n \n def testInvokeAddview(self):\n portlet = getUtility(IPortletType, name=\'plone.portlet.static.Static\')\n@@ -46,8 +46,8 @@ def testInvokeAddview(self):\n data={\'header\': u"test title", \'text\': u"test text"}\n )\n \n- self.assertEquals(len(mapping), 1)\n- self.failUnless(isinstance(list(mapping.values())[0], static.Assignment))\n+ self.assertEqual(len(mapping), 1)\n+ self.assertTrue(isinstance(list(mapping.values())[0], static.Assignment))\n \n def testInvokeEditView(self):\n mapping = PortletAssignmentMapping()\n@@ -55,7 +55,7 @@ def testInvokeEditView(self):\n \n mapping[\'foo\'] = static.Assignment(header=u"title", text="text")\n editview = getMultiAdapter((mapping[\'foo\'], request), name=\'edit\')\n- self.failUnless(isinstance(editview, static.EditForm))\n+ self.assertTrue(isinstance(editview, static.EditForm))\n \n def testRenderer(self):\n context = self.portal\n@@ -72,9 +72,9 @@ def testRenderer(self):\n (context, request, view, manager, assignment),\n IPortletRenderer\n )\n- self.failUnless(isinstance(renderer, static.Renderer))\n+ self.assertTrue(isinstance(renderer, static.Renderer))\n \n- self.failUnless(renderer.available,\n+ self.assertTrue(renderer.available,\n "Renderer should be available by default.")\n \n \n@@ -120,8 +120,8 @@ def test_render(self):\n )\n r.update()\n output = r.render()\n- self.failUnless(\'title\' in output)\n- self.failUnless(\'<b>text</b>\' in output)\n+ self.assertTrue(\'title\' in output)\n+ self.assertTrue(\'<b>text</b>\' in output)\n \n def test_no_header(self):\n r = self.renderer(\n@@ -144,7 +144,7 @@ def test_css_class(self):\n text="<b>text</b>"\n )\n )\n- self.assertEquals(\'portlet-static-welcome-text\', r.css_class())\n+ self.assertEqual(\'portlet-static-welcome-text\', r.css_class())\n \n def test_relative_link(self):\n r = self.renderer(\n' | ||
| b'diff --git a/Products/MimetypesRegistry/encoding.py b/Products/MimetypesRegistry/encoding.py\nindex 1de7d7a..da95771 100644\n--- a/Products/MimetypesRegistry/encoding.py\n+++ b/Products/MimetypesRegistry/encoding.py\n@@ -4,10 +4,10 @@\n import six\n \n \n-EMACS_ENCODING_RGX = re.compile(\'[^#]*[#\\s]*-\\*-\\s*coding: ([^\\s]*)\\s*-\\*-\\s*\')\n-VIM_ENCODING_RGX = re.compile(\'[^#]*[#\\s]*vim:fileencoding=\\s*([^\\s]*)\\s*\')\n-XML_ENCODING_RGX = re.compile(\'<\\?xml version=[^\\s]*\\s*encoding=([^\\s]*)\\s*\\?>\') # noqa\n-CHARSET_RGX = re.compile(\'charset=([^\\s"]*)\')\n+EMACS_ENCODING_RGX = re.compile(r\'[^#]*[#\\s]*-\\*-\\s*coding: ([^\\s]*)\\s*-\\*-\\s*\')\n+VIM_ENCODING_RGX = re.compile(r\'[^#]*[#\\s]*vim:fileencoding=\\s*([^\\s]*)\\s*\')\n+XML_ENCODING_RGX = re.compile(r\'<\\?xml version=[^\\s]*\\s*encoding=([^\\s]*)\\s*\\?>\')\n+CHARSET_RGX = re.compile(r\'charset=([^\\s"]*)\')\n \n \n def guess_encoding(buffer):\ndiff --git a/Products/MimetypesRegistry/mime_types/magic.py b/Products/MimetypesRegistry/mime_types/magic.py\nindex 6cb33fe..d51a617 100644\n--- a/Products/MimetypesRegistry/mime_types/magic.py\n+++ b/Products/MimetypesRegistry/mime_types/magic.py\n@@ -95,7 +95,7 @@\n [0,\n \'string\',\n \'=\',\n- b\'8BPS\\ \\ \\000\\000\\000\\000 &0xffffffff0000ffffffff\',\n+ br\'8BPS \\000\\000\\000\\000 &0xffffffff0000ffffffff\',\n \'image/x-psd\'],\n [0, \'string\', \'=\', b\'#LyX\', \'text/x-lyx\'],\n [0, \'string\', \'=\', b\'DCMw\', \'application/dicom\'],\n@@ -122,12 +122,12 @@\n [0,\n \'string\',\n \'=\',\n- b\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n+ br\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n \'application/x-mozilla-bookmarks\'],\n [0,\n \'string\',\n \'=\',\n- b\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n+ br\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n \'application/x-netscape-bookmarks\'],\n [0,\n \'string\',\n@@ -137,8 +137,8 @@\n [0, \'string\', \'=\', b\'<!DOCTYPE svg\', \'image/svg+xml\'],\n [0, \'string\', \'=\', b\'<svg\', \'image/svg+xml\'],\n [0, \'string\', \'=\', b\'<?php\', \'application/x-php\'],\n- [0, \'string\', \'=\', b\'<smil\\>\', \'application/smil\'],\n- [0, \'string\', \'=\', b\'<SMIL\\>\', \'application/smil\'],\n+ [0, \'string\', \'=\', br\'<smil\\>\', \'application/smil\'],\n+ [0, \'string\', \'=\', br\'<SMIL\\>\', \'application/smil\'],\n [0, \'string\', \'=\', b\'<!DOCTYPE HTML\', \'text/html\'],\n [0, \'string\', \'=\', b\'<!DOCTYPE html\', \'text/html\'],\n [0, \'string\', \'=\', b\'<!doctype html\', \'text/html\'],\n@@ -152,7 +152,7 @@\n [0, \'string\', \'=\', b\'<HTML\', \'text/html\'],\n [0, \'string\', \'=\', b\'<dia:diagram\', \'application/x-dia-diagram\'],\n [0, \'string\', \'=\', b\'<abiword\', \'application/x-abiword\'],\n- [0, \'string\', \'=\', b\'<\\!DOCTYPE abiword\', \'application/x-abiword\'],\n+ [0, \'string\', \'=\', br\'<\\!DOCTYPE abiword\', \'application/x-abiword\'],\n [0, \'string\', \'=\', b\'gmr:Workbook\', \'application/x-gnumeric\'],\n [0, \'string\', \'=\', b\'<?xml\', \'text/xml\'],\n [0, \'string\', \'=\', b\'{\\\\rtf\', \'application/rtf\'],\n@@ -188,8 +188,8 @@\n [0, \'belong\', \'=\', b\'0x000001b3\', \'video/mpeg\'],\n [0, \'string\', \'=\', b\'RIFF\', \'audio/x-riff\'],\n [0, \'string\', \'=\', b\'OggS \', \'audio/ogg\'],\n- [0, \'string\', \'=\', b\'pnm:\\/\\/\', \'audio/vnd.rn-realaudio\'],\n- [0, \'string\', \'=\', b\'rtsp:\\/\\/\', \'audio/vnd.rn-realaudio\'],\n+ [0, \'string\', \'=\', br\'pnm://\', \'audio/vnd.rn-realaudio\'],\n+ [0, \'string\', \'=\', br\'rtsp://\', \'audio/vnd.rn-realaudio\'],\n [0, \'string\', \'=\', b\'SIT!\', \'application/x-stuffit\'],\n [0, \'string\', \'=\', b\'\\312\\376\\272\\276\', \'application/x-java\'],\n [0, \'string\', \'=\', b\'Joy!\', \'application/x-pef-executable\'],\n@@ -239,7 +239,7 @@\n [0, \'string\', \'=\', b\'\\xff\\x46\\x4f\\x4e\', \'application/x-font-dos\'],\n [7, \'string\', \'=\', b\'\\x00\\x45\\x47\\x41\', \'application/x-font-dos\'],\n [7, \'string\', \'=\', b\'\\x00\\x56\\x49\\x44\', \'application/x-font-dos\'],\n- [0, \'string\', \'=\', b\'\\<MakerScreenFont\', \'application/x-font-framemaker\'],\n+ [0, \'string\', \'=\', br\'\\<MakerScreenFont\', \'application/x-font-framemaker\'],\n [0, \'string\', \'=\', b\'\\000\\001\\000\\000\\000\', \'application/x-font-ttf\'],\n [1, \'string\', \'=\', b\'WPC\', \'application/x-wordperfect\'],\n [0, \'string\', \'=\', b\'ID;\', \'text/spreadsheet\'],\ndiff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..c763a41\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed invalid escape sequences.\n+[maurits]\n' | ||
|
|
||
| Repository: plone.portlet.static | ||
| Repository: Products.MimetypesRegistry | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2020-09-10T10:53:05+02:00 | ||
| Date: 2020-09-10T10:54:10+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.portlet.static/commit/6b09aec2ca89a17388a4af899bc388edb01513fe | ||
| Commit: https://github.com/plone/Products.MimetypesRegistry/commit/89ff1004450b369cf8bd25c002dadd2b0a22e184 | ||
|
|
||
| Merge pull request #18 from plone/maurits/fix-warnings-2 | ||
| Merge pull request #18 from plone/maurits/fix-warnings | ||
|
|
||
| Fixed invalid escape sequence | ||
| Fixed invalid escape sequences. | ||
|
|
||
| Files changed: | ||
| A news/3130.bugfix | ||
| M plone/portlet/static/static.py | ||
| M plone/portlet/static/tests/test_portlet_static.py | ||
| M Products/MimetypesRegistry/encoding.py | ||
| M Products/MimetypesRegistry/mime_types/magic.py | ||
|
|
||
| b'diff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..8c80dfd\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed invalid escape sequence.\n+[maurits]\ndiff --git a/plone/portlet/static/static.py b/plone/portlet/static/static.py\nindex 35ca86d..95127d3 100644\n--- a/plone/portlet/static/static.py\n+++ b/plone/portlet/static/static.py\n@@ -64,7 +64,7 @@ class IStaticPortlet(IPortletDataProvider):\n header = schema.TextLine(\n title=_(u"Portlet header"),\n description=_(u"Title of the rendered portlet"),\n- constraint=re.compile("[^\\s]").match,\n+ constraint=re.compile(r"[^\\s]").match,\n required=False)\n \n directives.widget(text=RichTextFieldWidget)\ndiff --git a/plone/portlet/static/tests/test_portlet_static.py b/plone/portlet/static/tests/test_portlet_static.py\nindex 2c217ba..8a01011 100644\n--- a/plone/portlet/static/tests/test_portlet_static.py\n+++ b/plone/portlet/static/tests/test_portlet_static.py\n@@ -26,12 +26,12 @@ def setUp(self):\n \n def testPortletTypeRegistered(self):\n portlet = getUtility(IPortletType, name=\'plone.portlet.static.Static\')\n- self.assertEquals(portlet.addview, \'plone.portlet.static.Static\')\n+ self.assertEqual(portlet.addview, \'plone.portlet.static.Static\')\n \n def testInterfaces(self):\n portlet = static.Assignment(header=u"title", text="text")\n- self.failUnless(IPortletAssignment.providedBy(portlet))\n- self.failUnless(IPortletDataProvider.providedBy(portlet.data))\n+ self.assertTrue(IPortletAssignment.providedBy(portlet))\n+ self.assertTrue(IPortletDataProvider.providedBy(portlet.data))\n \n def testInvokeAddview(self):\n portlet = getUtility(IPortletType, name=\'plone.portlet.static.Static\')\n@@ -46,8 +46,8 @@ def testInvokeAddview(self):\n data={\'header\': u"test title", \'text\': u"test text"}\n )\n \n- self.assertEquals(len(mapping), 1)\n- self.failUnless(isinstance(list(mapping.values())[0], static.Assignment))\n+ self.assertEqual(len(mapping), 1)\n+ self.assertTrue(isinstance(list(mapping.values())[0], static.Assignment))\n \n def testInvokeEditView(self):\n mapping = PortletAssignmentMapping()\n@@ -55,7 +55,7 @@ def testInvokeEditView(self):\n \n mapping[\'foo\'] = static.Assignment(header=u"title", text="text")\n editview = getMultiAdapter((mapping[\'foo\'], request), name=\'edit\')\n- self.failUnless(isinstance(editview, static.EditForm))\n+ self.assertTrue(isinstance(editview, static.EditForm))\n \n def testRenderer(self):\n context = self.portal\n@@ -72,9 +72,9 @@ def testRenderer(self):\n (context, request, view, manager, assignment),\n IPortletRenderer\n )\n- self.failUnless(isinstance(renderer, static.Renderer))\n+ self.assertTrue(isinstance(renderer, static.Renderer))\n \n- self.failUnless(renderer.available,\n+ self.assertTrue(renderer.available,\n "Renderer should be available by default.")\n \n \n@@ -120,8 +120,8 @@ def test_render(self):\n )\n r.update()\n output = r.render()\n- self.failUnless(\'title\' in output)\n- self.failUnless(\'<b>text</b>\' in output)\n+ self.assertTrue(\'title\' in output)\n+ self.assertTrue(\'<b>text</b>\' in output)\n \n def test_no_header(self):\n r = self.renderer(\n@@ -144,7 +144,7 @@ def test_css_class(self):\n text="<b>text</b>"\n )\n )\n- self.assertEquals(\'portlet-static-welcome-text\', r.css_class())\n+ self.assertEqual(\'portlet-static-welcome-text\', r.css_class())\n \n def test_relative_link(self):\n r = self.renderer(\n' | ||
| b'diff --git a/Products/MimetypesRegistry/encoding.py b/Products/MimetypesRegistry/encoding.py\nindex 1de7d7a..da95771 100644\n--- a/Products/MimetypesRegistry/encoding.py\n+++ b/Products/MimetypesRegistry/encoding.py\n@@ -4,10 +4,10 @@\n import six\n \n \n-EMACS_ENCODING_RGX = re.compile(\'[^#]*[#\\s]*-\\*-\\s*coding: ([^\\s]*)\\s*-\\*-\\s*\')\n-VIM_ENCODING_RGX = re.compile(\'[^#]*[#\\s]*vim:fileencoding=\\s*([^\\s]*)\\s*\')\n-XML_ENCODING_RGX = re.compile(\'<\\?xml version=[^\\s]*\\s*encoding=([^\\s]*)\\s*\\?>\') # noqa\n-CHARSET_RGX = re.compile(\'charset=([^\\s"]*)\')\n+EMACS_ENCODING_RGX = re.compile(r\'[^#]*[#\\s]*-\\*-\\s*coding: ([^\\s]*)\\s*-\\*-\\s*\')\n+VIM_ENCODING_RGX = re.compile(r\'[^#]*[#\\s]*vim:fileencoding=\\s*([^\\s]*)\\s*\')\n+XML_ENCODING_RGX = re.compile(r\'<\\?xml version=[^\\s]*\\s*encoding=([^\\s]*)\\s*\\?>\')\n+CHARSET_RGX = re.compile(r\'charset=([^\\s"]*)\')\n \n \n def guess_encoding(buffer):\ndiff --git a/Products/MimetypesRegistry/mime_types/magic.py b/Products/MimetypesRegistry/mime_types/magic.py\nindex 6cb33fe..d51a617 100644\n--- a/Products/MimetypesRegistry/mime_types/magic.py\n+++ b/Products/MimetypesRegistry/mime_types/magic.py\n@@ -95,7 +95,7 @@\n [0,\n \'string\',\n \'=\',\n- b\'8BPS\\ \\ \\000\\000\\000\\000 &0xffffffff0000ffffffff\',\n+ br\'8BPS \\000\\000\\000\\000 &0xffffffff0000ffffffff\',\n \'image/x-psd\'],\n [0, \'string\', \'=\', b\'#LyX\', \'text/x-lyx\'],\n [0, \'string\', \'=\', b\'DCMw\', \'application/dicom\'],\n@@ -122,12 +122,12 @@\n [0,\n \'string\',\n \'=\',\n- b\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n+ br\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n \'application/x-mozilla-bookmarks\'],\n [0,\n \'string\',\n \'=\',\n- b\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n+ br\'<!DOCTYPE NETSCAPE-Bookmark-file-1\\>\',\n \'application/x-netscape-bookmarks\'],\n [0,\n \'string\',\n@@ -137,8 +137,8 @@\n [0, \'string\', \'=\', b\'<!DOCTYPE svg\', \'image/svg+xml\'],\n [0, \'string\', \'=\', b\'<svg\', \'image/svg+xml\'],\n [0, \'string\', \'=\', b\'<?php\', \'application/x-php\'],\n- [0, \'string\', \'=\', b\'<smil\\>\', \'application/smil\'],\n- [0, \'string\', \'=\', b\'<SMIL\\>\', \'application/smil\'],\n+ [0, \'string\', \'=\', br\'<smil\\>\', \'application/smil\'],\n+ [0, \'string\', \'=\', br\'<SMIL\\>\', \'application/smil\'],\n [0, \'string\', \'=\', b\'<!DOCTYPE HTML\', \'text/html\'],\n [0, \'string\', \'=\', b\'<!DOCTYPE html\', \'text/html\'],\n [0, \'string\', \'=\', b\'<!doctype html\', \'text/html\'],\n@@ -152,7 +152,7 @@\n [0, \'string\', \'=\', b\'<HTML\', \'text/html\'],\n [0, \'string\', \'=\', b\'<dia:diagram\', \'application/x-dia-diagram\'],\n [0, \'string\', \'=\', b\'<abiword\', \'application/x-abiword\'],\n- [0, \'string\', \'=\', b\'<\\!DOCTYPE abiword\', \'application/x-abiword\'],\n+ [0, \'string\', \'=\', br\'<\\!DOCTYPE abiword\', \'application/x-abiword\'],\n [0, \'string\', \'=\', b\'gmr:Workbook\', \'application/x-gnumeric\'],\n [0, \'string\', \'=\', b\'<?xml\', \'text/xml\'],\n [0, \'string\', \'=\', b\'{\\\\rtf\', \'application/rtf\'],\n@@ -188,8 +188,8 @@\n [0, \'belong\', \'=\', b\'0x000001b3\', \'video/mpeg\'],\n [0, \'string\', \'=\', b\'RIFF\', \'audio/x-riff\'],\n [0, \'string\', \'=\', b\'OggS \', \'audio/ogg\'],\n- [0, \'string\', \'=\', b\'pnm:\\/\\/\', \'audio/vnd.rn-realaudio\'],\n- [0, \'string\', \'=\', b\'rtsp:\\/\\/\', \'audio/vnd.rn-realaudio\'],\n+ [0, \'string\', \'=\', br\'pnm://\', \'audio/vnd.rn-realaudio\'],\n+ [0, \'string\', \'=\', br\'rtsp://\', \'audio/vnd.rn-realaudio\'],\n [0, \'string\', \'=\', b\'SIT!\', \'application/x-stuffit\'],\n [0, \'string\', \'=\', b\'\\312\\376\\272\\276\', \'application/x-java\'],\n [0, \'string\', \'=\', b\'Joy!\', \'application/x-pef-executable\'],\n@@ -239,7 +239,7 @@\n [0, \'string\', \'=\', b\'\\xff\\x46\\x4f\\x4e\', \'application/x-font-dos\'],\n [7, \'string\', \'=\', b\'\\x00\\x45\\x47\\x41\', \'application/x-font-dos\'],\n [7, \'string\', \'=\', b\'\\x00\\x56\\x49\\x44\', \'application/x-font-dos\'],\n- [0, \'string\', \'=\', b\'\\<MakerScreenFont\', \'application/x-font-framemaker\'],\n+ [0, \'string\', \'=\', br\'\\<MakerScreenFont\', \'application/x-font-framemaker\'],\n [0, \'string\', \'=\', b\'\\000\\001\\000\\000\\000\', \'application/x-font-ttf\'],\n [1, \'string\', \'=\', b\'WPC\', \'application/x-wordperfect\'],\n [0, \'string\', \'=\', b\'ID;\', \'text/spreadsheet\'],\ndiff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..c763a41\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed invalid escape sequences.\n+[maurits]\n' | ||
|
|