Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-sphinxcontrib-httpdomain for
openSUSE:Factory checked in at 2021-07-10 22:54:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-httpdomain (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-httpdomain.new.2625
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-httpdomain"
Sat Jul 10 22:54:37 2021 rev:22 rq:905350 version:1.7.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-httpdomain/python-sphinxcontrib-httpdomain.changes
2021-03-02 12:48:44.572519109 +0100
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-httpdomain.new.2625/python-sphinxcontrib-httpdomain.changes
2021-07-10 22:55:08.515462441 +0200
@@ -1,0 +2,6 @@
+Fri Jul 9 19:26:19 UTC 2021 - Matej Cepl <[email protected]>
+
+- Add missing_force_decode.patch with shim for missing
+ force_decode method (gh#sphinx-contrib/httpdomain#46).
+
+-------------------------------------------------------------------
New:
----
missing_force_decode.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-httpdomain.spec ++++++
--- /var/tmp/diff_new_pack.HGso8B/_old 2021-07-10 22:55:08.959459015 +0200
+++ /var/tmp/diff_new_pack.HGso8B/_new 2021-07-10 22:55:08.959459015 +0200
@@ -25,6 +25,9 @@
License: BSD-2-Clause
URL: https://github.com/sphinx-contrib/httpdomain
Source:
https://github.com/sphinx-contrib/httpdomain/archive/%{version}.tar.gz
+# PATCH-FIX-UPSTREAM missing_force_decode.patch
gh#sphinx-contrib/httpdomain#46 [email protected]
+# Add missing force_decode function in case it is missing in the actual Sphinx
+Patch0: missing_force_decode.patch
BuildRequires: %{python_module Flask >= 0.11}
BuildRequires: %{python_module Sphinx >= 1.5}
BuildRequires: %{python_module bottle >= 0.11.0}
@@ -49,7 +52,7 @@
http://packages.python.org/sphinxcontrib-httpdomain/
%prep
-%setup -q -n httpdomain-%{version}
+%autosetup -p1 -n httpdomain-%{version}
%build
%python_build
++++++ missing_force_decode.patch ++++++
---
sphinxcontrib/autohttp/__init__.py | 19 +++++++++++++++++++
sphinxcontrib/autohttp/bottle.py | 5 ++++-
sphinxcontrib/autohttp/flask.py | 5 ++++-
sphinxcontrib/autohttp/flask_base.py | 5 ++++-
sphinxcontrib/autohttp/tornado.py | 5 ++++-
5 files changed, 35 insertions(+), 4 deletions(-)
--- a/sphinxcontrib/autohttp/__init__.py
+++ b/sphinxcontrib/autohttp/__init__.py
@@ -9,3 +9,22 @@
:license: BSD, see LICENSE for details.
"""
+
+# Taken from gh#sphinx-doc/sphinx#9326
+def force_decode(string: str, encoding: str) -> str:
+ """Forcibly get a unicode string out of a bytestring."""
+ warnings.warn('force_decode() is deprecated.',
+ RemovedInSphinx50Warning, stacklevel=2)
+ if isinstance(string, bytes):
+ try:
+ if encoding:
+ string = string.decode(encoding)
+ else:
+ # try decoding with utf-8, should only work for real UTF-8
+ string = string.decode()
+ except UnicodeError:
+ # last resort -- can't fail
+ string = string.decode('latin1')
+ return string
+
+
--- a/sphinxcontrib/autohttp/bottle.py
+++ b/sphinxcontrib/autohttp/bottle.py
@@ -17,7 +17,10 @@ from docutils import nodes
from docutils.parsers.rst import directives, Directive
from docutils.statemachine import ViewList
-from sphinx.util import force_decode
+try:
+ from sphinx.util import force_decode
+except ImportError:
+ from . import force_decode
from sphinx.util.nodes import nested_parse_with_titles
from sphinx.util.docstrings import prepare_docstring
from sphinx.pycode import ModuleAnalyzer
--- a/sphinxcontrib/autohttp/flask.py
+++ b/sphinxcontrib/autohttp/flask.py
@@ -19,7 +19,10 @@ from docutils import nodes
from docutils.parsers.rst import directives, Directive
from docutils.statemachine import ViewList
-from sphinx.util import force_decode
+try:
+ from sphinx.util import force_decode
+except ImportError:
+ from . import force_decode
from sphinx.util.nodes import nested_parse_with_titles
from sphinx.util.docstrings import prepare_docstring
from sphinx.pycode import ModuleAnalyzer
--- a/sphinxcontrib/autohttp/flask_base.py
+++ b/sphinxcontrib/autohttp/flask_base.py
@@ -17,7 +17,10 @@ import collections
from docutils.parsers.rst import directives, Directive
-from sphinx.util import force_decode
+try:
+ from sphinx.util import force_decode
+except ImportError:
+ from . import force_decode
from sphinx.util.docstrings import prepare_docstring
from sphinx.pycode import ModuleAnalyzer
--- a/sphinxcontrib/autohttp/tornado.py
+++ b/sphinxcontrib/autohttp/tornado.py
@@ -18,7 +18,10 @@ from docutils import nodes
from docutils.parsers.rst import directives, Directive
from docutils.statemachine import ViewList
-from sphinx.util import force_decode
+try:
+ from sphinx.util import force_decode
+except ImportError:
+ from . import force_decode
from sphinx.util.nodes import nested_parse_with_titles
from sphinx.util.docstrings import prepare_docstring
from sphinx.pycode import ModuleAnalyzer
