Skip to content

Commit d9914f3

Browse files
committed
Merge pull request astropy#51 from sergiopasra/sphinx-py3
Use except-as instead of comma for py3 compatibility
2 parents c1b2eab + 2b1e9de commit d9914f3

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎astropy_helpers/sphinx/ext/automodsumm.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ def generate_automodsumm_docs(lines, srcfn, suffix='.rst', warn=None,
417417

418418
try:
419419
name, obj, parent = import_by_name(name)
420-
except ImportError, e:
420+
except ImportError as e:
421421
warn('[automodsumm] failed to import %r: %s' % (name, e))
422422
continue
423423

‎astropy_helpers/sphinx/ext/viewcode.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
import sys
2222
import traceback
2323

24+
if sys.version < '3':
25+
text_type = unicode
26+
else:
27+
text_type = str
2428

2529
def doctree_read(app, doctree):
2630
env = app.builder.env
@@ -30,7 +34,7 @@ def doctree_read(app, doctree):
3034
def get_full_modname(modname, attribute):
3135
try:
3236
__import__(modname)
33-
except Exception, error:
37+
except Exception as error:
3438
if not app.quiet:
3539
app.info(traceback.format_exc().rstrip())
3640
app.warn('viewcode can\'t import %s, failed with error "%s"' %
@@ -61,7 +65,7 @@ def has_tag(modname, fullname, docname, refname):
6165
env._viewcode_modules[modname] = False
6266
return
6367
analyzer.find_tags()
64-
if not isinstance(analyzer.code, unicode):
68+
if not isinstance(analyzer.code, text_type):
6569
code = analyzer.code.decode(analyzer.encoding)
6670
else:
6771
code = analyzer.code

0 commit comments

Comments
 (0)