diff options
Diffstat (limited to 'sphinx/application.py')
| -rw-r--r-- | sphinx/application.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sphinx/application.py b/sphinx/application.py index c9626b3b4..89d6f6232 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -10,6 +10,7 @@ :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. """ +from __future__ import print_function import os import sys @@ -38,6 +39,8 @@ from sphinx.util.tags import Tags from sphinx.util.osutil import ENOENT from sphinx.util.console import bold, lightgray, darkgray +if hasattr(sys, 'intern'): + intern = sys.intern # List of all known core events. Maps name to arguments description. events = { @@ -174,7 +177,7 @@ class Sphinx(object): # this can raise if the data version doesn't fit self.env.domains[domain] = self.domains[domain](self.env) self.info('done') - except Exception, err: + except Exception as err: if type(err) is IOError and err.errno == ENOENT: self.info('not yet created') else: @@ -185,7 +188,7 @@ class Sphinx(object): def _init_builder(self, buildername): if buildername is None: - print >>self._status, 'No builder selected, using default: html' + print('No builder selected, using default: html', file=self._status) buildername = 'html' if buildername not in self.builderclasses: raise SphinxError('Builder name %s not registered' % buildername) @@ -209,7 +212,7 @@ class Sphinx(object): self.builder.build_specific(filenames) else: self.builder.build_update() - except Exception, err: + except Exception as err: # delete the saved env to force a fresh build next time envfile = path.join(self.doctreedir, ENV_PICKLE_FILENAME) if path.isfile(envfile): @@ -320,7 +323,7 @@ class Sphinx(object): return try: mod = __import__(extension, None, None, ['setup']) - except ImportError, err: + except ImportError as err: self.verbose('Original exception:\n' + traceback.format_exc()) raise ExtensionError('Could not import extension %s' % extension, err) @@ -330,7 +333,7 @@ class Sphinx(object): else: try: mod.setup(self) - except VersionRequirementError, err: + except VersionRequirementError as err: # add the extension name to the version required raise VersionRequirementError( 'The %s extension used by this project needs at least ' @@ -347,17 +350,17 @@ class Sphinx(object): """Import an object from a 'module.name' string.""" try: module, name = objname.rsplit('.', 1) - except ValueError, err: + except ValueError as err: raise ExtensionError('Invalid full object name %s' % objname + (source and ' (needed for %s)' % source or ''), err) try: return getattr(__import__(module, None, None, [name]), name) - except ImportError, err: + except ImportError as err: raise ExtensionError('Could not import %s' % module + (source and ' (needed for %s)' % source or ''), err) - except AttributeError, err: + except AttributeError as err: raise ExtensionError('Could not find %s' % objname + (source and ' (needed for %s)' % source or ''), err) |