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

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

BIT-1750 #merged

CHANGES

@@ -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
 
   * Fix for Sphinx >= 1.4 compability. (Robin Sommer)

VERSION

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

aux/btest

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

doc/ext/bro.py

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