|
0 |
From: Andreas Hasenack <andreas@canonical.com>
|
|
1 |
Date: Sun, 7 Feb 2021 10:32:30 +0100
|
|
2 |
Subject: Fix sphinx error
|
|
3 |
|
|
4 |
---
|
|
5 |
docsrc/exts/sphinxlocal/builders/manpage.py | 1 -
|
|
6 |
docsrc/exts/sphinxlocal/roles/saslman.py | 1 -
|
|
7 |
docsrc/exts/sphinxlocal/writers/manpage.py | 9 +++------
|
|
8 |
3 files changed, 3 insertions(+), 8 deletions(-)
|
|
9 |
|
|
10 |
diff --git a/docsrc/exts/sphinxlocal/builders/manpage.py b/docsrc/exts/sphinxlocal/builders/manpage.py
|
|
11 |
index a6281f7..126839e 100644
|
|
12 |
--- a/docsrc/exts/sphinxlocal/builders/manpage.py
|
|
13 |
+++ b/docsrc/exts/sphinxlocal/builders/manpage.py
|
|
14 |
@@ -21,7 +21,6 @@ from docutils.frontend import OptionParser
|
|
15 |
from sphinx import addnodes
|
|
16 |
from sphinx.errors import SphinxError
|
|
17 |
from sphinx.builders import Builder
|
|
18 |
-from sphinx.environment import NoUri
|
|
19 |
from sphinx.util.nodes import inline_all_toctrees
|
|
20 |
from sphinx.util.console import bold, darkgreen
|
|
21 |
from sphinx.writers.manpage import ManualPageWriter
|
|
22 |
diff --git a/docsrc/exts/sphinxlocal/roles/saslman.py b/docsrc/exts/sphinxlocal/roles/saslman.py
|
|
23 |
index f881d98..bcafeec 100644
|
|
24 |
--- a/docsrc/exts/sphinxlocal/roles/saslman.py
|
|
25 |
+++ b/docsrc/exts/sphinxlocal/roles/saslman.py
|
|
26 |
@@ -18,7 +18,6 @@ from string import Template
|
|
27 |
import re
|
|
28 |
|
|
29 |
def setup(app):
|
|
30 |
- app.info('Initializing saslman plugin')
|
|
31 |
app.add_crossref_type('saslman', 'saslman', '%s', nodes.generated)
|
|
32 |
return
|
|
33 |
|
|
34 |
diff --git a/docsrc/exts/sphinxlocal/writers/manpage.py b/docsrc/exts/sphinxlocal/writers/manpage.py
|
|
35 |
index 13864e0..e8e9c3a 100644
|
|
36 |
--- a/docsrc/exts/sphinxlocal/writers/manpage.py
|
|
37 |
+++ b/docsrc/exts/sphinxlocal/writers/manpage.py
|
|
38 |
@@ -13,8 +13,9 @@
|
|
39 |
"""
|
|
40 |
|
|
41 |
from docutils import nodes
|
|
42 |
+from time import strftime
|
|
43 |
+
|
|
44 |
from sphinx.writers.manpage import (
|
|
45 |
- MACRO_DEF,
|
|
46 |
ManualPageWriter,
|
|
47 |
ManualPageTranslator as BaseTranslator
|
|
48 |
)
|
|
49 |
@@ -22,7 +23,6 @@ from sphinx.writers.manpage import (
|
|
50 |
|
|
51 |
from sphinx import addnodes
|
|
52 |
from sphinx.locale import admonitionlabels, _
|
|
53 |
-from sphinx.util.osutil import ustrftime
|
|
54 |
|
|
55 |
class CyrusManualPageWriter(ManualPageWriter):
|
|
56 |
|
|
57 |
@@ -67,15 +67,12 @@ class CyrusManualPageTranslator(BaseTranslator):
|
|
58 |
if builder.config.today:
|
|
59 |
self._docinfo['date'] = builder.config.today
|
|
60 |
else:
|
|
61 |
- self._docinfo['date'] = ustrftime(builder.config.today_fmt
|
|
62 |
+ self._docinfo['date'] = strftime(builder.config.today_fmt
|
|
63 |
or _('%B %d, %Y'))
|
|
64 |
self._docinfo['copyright'] = builder.config.copyright
|
|
65 |
self._docinfo['version'] = builder.config.version
|
|
66 |
self._docinfo['manual_group'] = builder.config.project
|
|
67 |
|
|
68 |
- # since self.append_header() is never called, need to do this here
|
|
69 |
- self.body.append(MACRO_DEF)
|
|
70 |
-
|
|
71 |
# overwritten -- don't wrap literal_block with font calls
|
|
72 |
self.defs['literal_block'] = ('.sp\n.nf\n', '\n.fi\n')
|
|
73 |
|