Update python-sphinxcontrib-httpdomain to version 1.7.0 / rev 22 via …

…SR 905350 https://build.opensuse.org/request/show/905350 by user mcepl + dimstar_suse - Add missing_force_decode.patch with shim for missing force_decode method (gh#sphinx-contrib/httpdomain#46).
bmwiedemann · Jul 10, 2021 · 958dca4 · 958dca4
1 parent 460f2c6
commit 958dca4
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 1 deletion.
diff --git a/packages/p/python-sphinxcontrib-httpdomain/.files b/packages/p/python-sphinxcontrib-httpdomain/.files
diff --git a/packages/p/python-sphinxcontrib-httpdomain/.rev b/packages/p/python-sphinxcontrib-httpdomain/.rev
@@ -179,4 +179,14 @@
   is built for python2</comment>
     <requestid>876055</requestid>
   </revision>
+  <revision rev="22" vrev="9">
+    <srcmd5>e709d431052ea605667a1643c2037b72</srcmd5>
+    <version>1.7.0</version>
+    <time>1625950477</time>
+    <user>dimstar_suse</user>
+    <comment>- Add missing_force_decode.patch with shim for missing
+  force_decode method (gh#sphinx-contrib/httpdomain#46).
+</comment>
+    <requestid>905350</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/p/python-sphinxcontrib-httpdomain/missing_force_decode.patch b/packages/p/python-sphinxcontrib-httpdomain/missing_force_decode.patch
@@ -0,0 +1,89 @@
+---
+ 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
diff --git a/packages/p/python-sphinxcontrib-httpdomain/python-sphinxcontrib-httpdomain.changes b/packages/p/python-sphinxcontrib-httpdomain/python-sphinxcontrib-httpdomain.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  9 19:26:19 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add missing_force_decode.patch with shim for missing
+  force_decode method (gh#sphinx-contrib/httpdomain#46).
+
 -------------------------------------------------------------------
 Mon Mar  1 20:57:30 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

diff --git a/packages/p/python-sphinxcontrib-httpdomain/python-sphinxcontrib-httpdomain.spec b/packages/p/python-sphinxcontrib-httpdomain/python-sphinxcontrib-httpdomain.spec
@@ -25,6 +25,9 @@ Summary:        Sphinx domain for HTTP APIs
 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 mcepl@suse.com
+# 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 @@ You can find the documentation from the following URL:
 http://packages.python.org/sphinxcontrib-httpdomain/
 
 %prep
-%setup -q -n httpdomain-%{version}
+%autosetup -p1 -n httpdomain-%{version}
 
 %build
 %python_build