Your message dated Tue, 12 Jun 2018 21:05:32 +0000
with message-id <e1fsqts-000i6b...@fasolo.debian.org>
and subject line Bug#899415: fixed in zzzeeksphinx 1.0.20-2
has caused the Debian Bug report #899415,
regarding zzzeeksphinx: Cherry-picked upstream patches required for 
zzzeeksphinx to work with sphinx >= 1.7.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
899415: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899415
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: zzzeeksphinx
Version: 1.0.20-1
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/sphinx-has-deprecated-Directive.patch,
    d/p/use-regular-python-tokenize.patch,
    d/p/remove-find-the-docstring.patch,
    d/p/more-updates-for-sphinx.patch: Cherry-picked patches from upstream
    to handled code removed from sphinx as of 1.7.0.


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers cosmic
  APT policy: (500, 'cosmic'), (500, 'bionic-security')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-20-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch 
zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch
--- zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch    
1969-12-31 16:00:00.000000000 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/more-updates-for-sphinx.patch    
2018-05-23 10:36:34.000000000 -0700
@@ -0,0 +1,45 @@
+From d7a89f115fdb3ab1431161a446d636eaad3185c7 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike...@zzzcomputing.com>
+Date: Fri, 16 Feb 2018 13:33:55 -0500
+Subject: [PATCH] - more updates for sphinx
+
+---
+ zzzeeksphinx/viewsource.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index 7ee590b..8b20c43 100644
+--- a/zzzeeksphinx/viewsource.py
++++ b/zzzeeksphinx/viewsource.py
+@@ -100,7 +100,7 @@ def _view_source_node(env, text, state):
+         code = analyzer.code
+ 
+     if state is not None:
+-        docstring = _find_mod_docstring(analyzer)
++        docstring = _find_mod_docstring(pathname)
+         if docstring:
+             # get rid of "foo.py" at the top
+             docstring = re.sub(r"^[a-zA-Z_0-9]+\.py", "", docstring)
+@@ -155,15 +155,16 @@ def _view_source_node(env, text, state):
+     return return_node
+ 
+ 
+-def _find_mod_docstring(analyzer):
++def _find_mod_docstring(pathname):
+     """attempt to locate the module-level docstring.
+ 
+     Note that sphinx autodoc just uses ``__doc__``.  But we don't want
+     to import the module, so we need to parse for it.
+ 
+     """
+-    analyzer.tokenize()
+-    for type_, parsed_line, start_pos, end_pos, raw_line in analyzer.tokens:
++    fhandle = open(pathname, 'rb')
++    for type_, parsed_line, start_pos, end_pos, raw_line in \
++            token.tokenize(fhandle.readline):
+         if type_ == token.COMMENT:
+             continue
+         elif type_ == token.STRING:
+-- 
+2.17.0
+
diff -Nru zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch 
zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch
--- zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch  
1969-12-31 16:00:00.000000000 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/remove-find-the-docstring.patch  
2018-05-23 10:36:34.000000000 -0700
@@ -0,0 +1,113 @@
+From 0e2d505df24d4478030592d59c2abe07ccfc03cf Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike...@zzzcomputing.com>
+Date: Fri, 16 Feb 2018 16:40:33 -0500
+Subject: [PATCH] - remove the "find the docstring" aspect of this code that
+ doesn't seem to be doing anything and is breaking on old Pythons, new
+ sphinxes, too much.
+
+---
+ zzzeeksphinx/viewsource.py | 67 +++++++-------------------------------
+ 1 file changed, 11 insertions(+), 56 deletions(-)
+
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index 8b20c43..9fc6e2c 100644
+--- a/zzzeeksphinx/viewsource.py
++++ b/zzzeeksphinx/viewsource.py
+@@ -5,9 +5,7 @@ import imp
+ import re
+ from docutils.parsers.rst import Directive
+ import os
+-from docutils.statemachine import StringList
+ from sphinx.environment import NoUri
+-import tokenize as token
+ import warnings
+ from . import util
+ 
+@@ -99,20 +97,6 @@ def _view_source_node(env, text, state):
+     else:
+         code = analyzer.code
+ 
+-    if state is not None:
+-        docstring = _find_mod_docstring(pathname)
+-        if docstring:
+-            # get rid of "foo.py" at the top
+-            docstring = re.sub(r"^[a-zA-Z_0-9]+\.py", "", docstring)
+-
+-            # strip
+-            docstring = docstring.strip()
+-
+-            # yank only first paragraph
+-            docstring = docstring.split("\n\n")[0].strip()
+-    else:
+-        docstring = None
+-
+     pagename = '_modules/' + modname.replace('.', '/')
+     try:
+         refuri = urito(env.docname, pagename)
+@@ -127,52 +111,23 @@ def _view_source_node(env, text, state):
+         entry = code, analyzer.tags, {}
+     env._viewcode_modules[modname] = entry
+ 
+-    if docstring:
+-        # embed the ref with the doc text so that it isn't
+-        # a separate paragraph
+-        if refuri:
+-            docstring = "`%s <%s>`_ - %s" % (text, refuri, docstring)
+-        else:
+-            docstring = "``%s`` - %s" % (text, docstring)
+-        para = nodes.paragraph('', '')
+-        state.nested_parse(StringList([docstring]), 0, para)
+-        return_node = para
++    if refuri:
++        refnode = nodes.reference(
++            '', '',
++            nodes.Text(text, text),
++            refuri=urito(env.docname, pagename)
++        )
+     else:
+-        if refuri:
+-            refnode = nodes.reference(
+-                '', '',
+-                nodes.Text(text, text),
+-                refuri=urito(env.docname, pagename)
+-            )
+-        else:
+-            refnode = nodes.Text(text, text)
++        refnode = nodes.Text(text, text)
+ 
+-        if state:
+-            return_node = nodes.paragraph('', '', refnode)
+-        else:
+-            return_node = refnode
++    if state:
++        return_node = nodes.paragraph('', '', refnode)
++    else:
++        return_node = refnode
+ 
+     return return_node
+ 
+ 
+-def _find_mod_docstring(pathname):
+-    """attempt to locate the module-level docstring.
+-
+-    Note that sphinx autodoc just uses ``__doc__``.  But we don't want
+-    to import the module, so we need to parse for it.
+-
+-    """
+-    fhandle = open(pathname, 'rb')
+-    for type_, parsed_line, start_pos, end_pos, raw_line in \
+-            token.tokenize(fhandle.readline):
+-        if type_ == token.COMMENT:
+-            continue
+-        elif type_ == token.STRING:
+-            return eval(parsed_line)
+-        else:
+-            return None
+-
+-
+ def _parse_content(content):
+     d = {}
+     d['text'] = []
+-- 
+2.17.0
+
diff -Nru zzzeeksphinx-1.0.20/debian/patches/series 
zzzeeksphinx-1.0.20/debian/patches/series
--- zzzeeksphinx-1.0.20/debian/patches/series   1969-12-31 16:00:00.000000000 
-0800
+++ zzzeeksphinx-1.0.20/debian/patches/series   2018-05-23 10:36:34.000000000 
-0700
@@ -0,0 +1,4 @@
+sphinx-has-deprecated-Directive.patch
+use-regular-python-tokenize.patch
+more-updates-for-sphinx.patch
+remove-find-the-docstring.patch
diff -Nru 
zzzeeksphinx-1.0.20/debian/patches/sphinx-has-deprecated-Directive.patch 
zzzeeksphinx-1.0.20/debian/patches/sphinx-has-deprecated-Directive.patch
--- zzzeeksphinx-1.0.20/debian/patches/sphinx-has-deprecated-Directive.patch    
1969-12-31 16:00:00.000000000 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/sphinx-has-deprecated-Directive.patch    
2018-05-23 10:36:34.000000000 -0700
@@ -0,0 +1,37 @@
+From 921f03f424eb1450ab87b3f43eae0b1b4dc8f558 Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike...@zzzcomputing.com>
+Date: Fri, 21 Jul 2017 13:31:28 -0400
+Subject: [PATCH] - sphinx has deprecated Directive
+
+---
+ zzzeeksphinx/dialect_info.py | 2 +-
+ zzzeeksphinx/viewsource.py   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/zzzeeksphinx/dialect_info.py b/zzzeeksphinx/dialect_info.py
+index ce5f316..e66219f 100644
+--- a/zzzeeksphinx/dialect_info.py
++++ b/zzzeeksphinx/dialect_info.py
+@@ -1,5 +1,5 @@
+ import re
+-from sphinx.util.compat import Directive
++from docutils.parsers.rst import Directive
+ from docutils import nodes
+ 
+ 
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index d510582..5762d85 100644
+--- a/zzzeeksphinx/viewsource.py
++++ b/zzzeeksphinx/viewsource.py
+@@ -3,7 +3,7 @@ from sphinx.ext.viewcode import collect_pages
+ from sphinx.pycode import ModuleAnalyzer
+ import imp
+ import re
+-from sphinx.util.compat import Directive
++from docutils.parsers.rst import Directive
+ import os
+ from docutils.statemachine import StringList
+ from sphinx.environment import NoUri
+-- 
+2.17.0
+
diff -Nru zzzeeksphinx-1.0.20/debian/patches/use-regular-python-tokenize.patch 
zzzeeksphinx-1.0.20/debian/patches/use-regular-python-tokenize.patch
--- zzzeeksphinx-1.0.20/debian/patches/use-regular-python-tokenize.patch        
1969-12-31 16:00:00.000000000 -0800
+++ zzzeeksphinx-1.0.20/debian/patches/use-regular-python-tokenize.patch        
2018-05-23 10:36:34.000000000 -0700
@@ -0,0 +1,26 @@
+From cc521ca5f41af1cb396f0d00c2a7af11f5992d6a Mon Sep 17 00:00:00 2001
+From: Mike Bayer <mike...@zzzcomputing.com>
+Date: Fri, 16 Feb 2018 12:18:08 -0500
+Subject: [PATCH] - use regular python tokenize here as that is where sphinx
+ was getting it
+
+---
+ zzzeeksphinx/viewsource.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zzzeeksphinx/viewsource.py b/zzzeeksphinx/viewsource.py
+index 5762d85..7ee590b 100644
+--- a/zzzeeksphinx/viewsource.py
++++ b/zzzeeksphinx/viewsource.py
+@@ -7,7 +7,7 @@ from docutils.parsers.rst import Directive
+ import os
+ from docutils.statemachine import StringList
+ from sphinx.environment import NoUri
+-from sphinx.pycode.pgen2 import token
++import tokenize as token
+ import warnings
+ from . import util
+ 
+-- 
+2.17.0
+

--- End Message ---
--- Begin Message ---
Source: zzzeeksphinx
Source-Version: 1.0.20-2

We believe that the bug you reported is fixed in the latest version of
zzzeeksphinx, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 899...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Piotr Ożarowski <pi...@debian.org> (supplier of updated zzzeeksphinx package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 12 Jun 2018 22:48:24 +0200
Source: zzzeeksphinx
Binary: python-zzzeeksphinx python3-zzzeeksphinx
Architecture: source all
Version: 1.0.20-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Python Modules Team 
<python-modules-t...@lists.alioth.debian.org>
Changed-By: Piotr Ożarowski <pi...@debian.org>
Description:
 python-zzzeeksphinx - Zzzeek's Sphinx layout and utilities
 python3-zzzeeksphinx - Zzzeek's Sphinx layout and utilities
Closes: 899415
Changes:
 zzzeeksphinx (1.0.20-2) unstable; urgency=medium
 .
   [ Ondřej Nový ]
   * d/control: Set Vcs-* to salsa.debian.org
   * d/copyright: Use https protocol in Format field
   * d/watch: Use https protocol
   * d/control: Remove ancient X-Python-Version field
 .
   [ Piotr Ożarowski ]
   * Cherry-pick few upstream commits required to work with Sphinx >= 1.7
     (closes: 899415, thanks to Corey Bryant)
Checksums-Sha1:
 0042b0dccb072f125eed669fb932d86b479d9066 2145 zzzeeksphinx_1.0.20-2.dsc
 be46a1dc1adfba975198567073e1ab7f75b9c98d 5364 
zzzeeksphinx_1.0.20-2.debian.tar.xz
 e81c3a6a2f6817eeee3baf81e2a0e54e41b0664c 23156 
python-zzzeeksphinx_1.0.20-2_all.deb
 c6c86d7e6f988b538d5314726e0f77a5889de1b6 23244 
python3-zzzeeksphinx_1.0.20-2_all.deb
 785cacd12a61b857f82fae585bb49cffb6639669 6941 
zzzeeksphinx_1.0.20-2_amd64.buildinfo
Checksums-Sha256:
 dc408a30ac8f94711701e4391562b1493dc093f49291b7635ee22488195b0bef 2145 
zzzeeksphinx_1.0.20-2.dsc
 c84fa1b863c90370de67bf709794bd33361e653e0f1b0ab23d29c173bccfb5b1 5364 
zzzeeksphinx_1.0.20-2.debian.tar.xz
 d4d43633551bc735fcb6688001a849762854e67b0afc380778a186778f3a1d6d 23156 
python-zzzeeksphinx_1.0.20-2_all.deb
 194dcdb4131719e42f4611f93de38083b5c9cf30a60435cfd5b951a049babbbf 23244 
python3-zzzeeksphinx_1.0.20-2_all.deb
 77ed60067fa64fa84d959bdeeaeea2127a57fddf5f3381934751f027fd88d0e4 6941 
zzzeeksphinx_1.0.20-2_amd64.buildinfo
Files:
 16f5bd47dd1d3d1b1095becc8d4c10dc 2145 python optional zzzeeksphinx_1.0.20-2.dsc
 32934345771155ae79fe4a19bbcc7267 5364 python optional 
zzzeeksphinx_1.0.20-2.debian.tar.xz
 cb341a0ba8a255820fa620108b84c5e5 23156 python optional 
python-zzzeeksphinx_1.0.20-2_all.deb
 fcced1bc1a8460d4deebf2d9fd363f74 23244 python optional 
python3-zzzeeksphinx_1.0.20-2_all.deb
 89a24d362377dd599fee3c3ee22643ad 6941 python optional 
zzzeeksphinx_1.0.20-2_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEHS+omFjar2IXhi33rvbxoqdFdkUFAlsgMegACgkQrvbxoqdF
dkUefA//dnJAowsM0W3DQSX//DSe6xyjjTHhwempFcQTFk0AcFURlu7hnyrKSLyr
1UlMdig1pwXNQYw4NiWiudwEzWWDqe0OGPHYDDlf3iFsNKYj5daJVZwCUikkP0t0
Z/pCQ6H0GiZBeqNzHfHU2DP6s4wkJu22h+LJdF3A6hf9Ox3WMVaoOX7It6GceAbS
C3X74igsJYp4SrGQ1aAXfsPeb9Gaqecw8X0TCrIjc1G0phaMWB5ZmHcpq+7Cxb//
hP4Lc5p3CBK8tTS5FFnT9Qfq4l/eYMVutL5GFwqynnumAmuFPffljQrSfgKh06L2
ZpdAiloWd2CYOT6jhOLRDXQWeMaRbN439jiuz1lFPKPQKvjr+z9VQX02oy47rUY+
/dkQ5NccYy8D3yVvjTDxsVlbFf/2TVcRfjPciqW31GDKLKTh600JjAidUyXtHHbX
fEjp318egWMJI3dE1XJC6QWq5qcePrXQ9oHV01v60TCw6/GNrOo+Qz9Qi1HXMkHi
nvhwuMY/FE9Nz9rHJrAL0mm6/InDJG1fOY7WEi8L0eSaVCo/U16w6w22ArkDtaMU
GQnKvnHa/GBSdm3YBVpuOoX7wwM38kS7wMMfStsqW4A2rL5039byjStEjgmREBW+
CWJptBzrRHjVdGFgAjpFqbWA4Gxcn4v7TyLpdta2xJdbahYu+T0=
=49ZE
-----END PGP SIGNATURE-----

--- End Message ---
_______________________________________________
Python-modules-team mailing list
Python-modules-team@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to