Skip to content

Commit 044587b

Browse files
committed
backwards-compatible fix for python3 API changes
1 parent 8bbf49c commit 044587b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/rosdoc_lite/landing_page.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,12 @@ def generate_links(package, manifest, rd_configs):
8282
:param rd_configs: [dict] package manifest rosdoc configs
8383
:returns: [str] list of html snippets
8484
"""
85-
config_list = [c for c in rd_configs.itervalues() if c['builder'] != 'rosmake']
85+
try:
86+
rd_configs_values = rd_configs.values()
87+
except AttributeError:
88+
# python2 fallback
89+
rd_configs_values = rd_configs.itervalues()
90+
config_list = [c for c in rd_configs_values if c['builder'] != 'rosmake']
8691
output_dirs = [output_location(c) for c in config_list]
8792
# filter out empties
8893
output_dirs = [d for d in output_dirs if d and d != '.']

src/rosdoc_lite/msgenator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
from __future__ import print_function
3434

35-
import cStringIO
35+
import io
3636
import os
3737
import sys
3838
import time
@@ -104,7 +104,7 @@ def _generate_raw_text(raw_text):
104104

105105
def _generate_msg_text_from_spec(package, spec, msg_context, buff=None, indent=0):
106106
if buff is None:
107-
buff = cStringIO.StringIO()
107+
buff = io.StringIO()
108108
for c in spec.constants:
109109
buff.write("%s%s %s=%s<br />" % ("&nbsp;"*indent, c.type, c.name, c.val_text))
110110
for type_, name in zip(spec.types, spec.names):

0 commit comments

Comments
 (0)