Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/dnthayer/ticket1750'

Browse source 
* origin/topic/dnthayer/ticket1750:
  Python 3 compatibility fixes for doc/ext/bro.py

BIT-1750 #merged
This commit is contained in:
Johanna Amann 2016-10-31 14:24:15 -07:00
commit be571986b2
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-beta-121 | 2016-10-31 14:24:33 -0700
* Python 3 compatibility fixes for documentation building. (Daniel Thayer)
2.5-beta-114 | 2016-10-27 09:00:24 -0700 2.5-beta-114 | 2016-10-27 09:00:24 -0700
* Fix for Sphinx >= 1.4 compability. (Robin Sommer) * Fix for Sphinx >= 1.4 compability. (Robin Sommer)

2
VERSION
View file

@ -1 +1 @@
2.5-beta-114 2.5-beta-121

2
aux/btest

@ -1 +1 @@
Subproject commit 17d1c1547678bfd54ef1202db5415bc85c7ae794 Subproject commit 16aeb4cc2055fc482447dd6ff0991f5a2940523c

7
doc/ext/bro.py
View file

@ -15,7 +15,6 @@ from sphinx.directives import ObjectDescription
from sphinx.roles import XRefRole from sphinx.roles import XRefRole
from sphinx.util.nodes import make_refnode from sphinx.util.nodes import make_refnode
from sphinx import version_info from sphinx import version_info
import string
from docutils import nodes from docutils import nodes
from docutils.parsers.rst import Directive from docutils.parsers.rst import Directive
@ -30,7 +29,7 @@ class SeeDirective(Directive):
def run(self): def run(self):
n = see('') n = see('')
n.refs = string.split(string.join(self.content)) n.refs = " ".join(self.content).split()
return [n] return [n]
# Wrapper for creating a tuple for index nodes, staying backwards # Wrapper for creating a tuple for index nodes, staying backwards
@ -214,7 +213,7 @@ class BroNotices(Index):
entries = content.setdefault(modname, []) entries = content.setdefault(modname, [])
entries.append([n[0], 0, n[1], n[2], '', '', '']) entries.append([n[0], 0, n[1], n[2], '', '', ''])
content = sorted(content.iteritems()) content = sorted(content.items())
return content, False return content, False
@ -290,5 +289,5 @@ class BroDomain(Domain):
'unknown target for ":bro:%s:`%s`"' % (typ, target)) 'unknown target for ":bro:%s:`%s`"' % (typ, target))
def get_objects(self): def get_objects(self):
for (typ, name), docname in self.data['objects'].iteritems(): for (typ, name), docname in self.data['objects'].items():
yield name, name, typ, docname, typ + '-' + name, 1 yield name, name, typ, docname, typ + '-' + name, 1