Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 19:40:12 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

More Python3 fixes

Browse Source
This commit is contained in:
Robin Dunn
2015-03-20 10:56:33 -07:00
parent a7cb363452
commit 42c661cf54
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etgtools/sphinx_generator.py
View File

@@ -1960,7 +1960,7 @@ class XMLDocString(object):
else: else:
raise Exception('Unhandled docstring kind for %s'%xml_item.__class__.__name__) raise Exception('Unhandled docstring kind for %s'%xml_item.__class__.__name__)
if hasattr(xml_item, 'deprecated') and xml_item.deprecated and isinstance(xml_item.deprecated, basestring): if hasattr(xml_item, 'deprecated') and xml_item.deprecated and isinstance(xml_item.deprecated, string_base):
element = et.Element('deprecated', kind='deprecated') element = et.Element('deprecated', kind='deprecated')
element.text = VERSION element.text = VERSION
@@ -2610,7 +2610,7 @@ class XMLDocString(object):
if hasattr(method, 'deprecated') and method.deprecated: if hasattr(method, 'deprecated') and method.deprecated:
text = method.deprecated text = method.deprecated
if isinstance(text, basestring): if isinstance(text, string_base):
text = '%s %s\n%s%s\n\n'%(' .. deprecated::', VERSION, ' '*9, text.replace('\n', ' ')) text = '%s %s\n%s%s\n\n'%(' .. deprecated::', VERSION, ' '*9, text.replace('\n', ' '))
stream.write(text) stream.write(text)

2
sphinxtools/utilities.py
View File

@@ -301,7 +301,7 @@ def PythonizeType(ptype, is_param):
else: else:
if is_param and '.' in ptype: if is_param and '.' in ptype:
modules = MODULENAME_REPLACE.values() modules = list(MODULENAME_REPLACE.values())
modules.sort() modules.sort()
modules = modules[1:] modules = modules[1:]
if ptype.split('.')[0] + '.' in modules: if ptype.split('.')[0] + '.' in modules: