Sphinx 1.6 compatibility

Author: jessetan

sphinx_rtd_theme/__init__.py

@@ -6,19 +6,23 @@
 
 from os import path
 import pkg_resources
-from sphinx.util import logging
-from sphinx.locale import get_translation
+
+from sphinx.locale import _
 
 import sphinx
 
+try:
+    # Available from Sphinx 1.6
+    from sphinx.util.logging import getLogger
+except ImportError:
+    from logging import getLogger
+
 
 __version__ = '0.4.3.dev0'
 __version_full__ = __version__
 
-logger = logging.getLogger('sphinx-rtd-theme')
-MESSAGE_CATALOG_NAME = 'sphinx'
-_ = get_translation(MESSAGE_CATALOG_NAME)
 
+logger = getLogger(__name__)
 
 def get_html_theme_path():
     """Return list of HTML theme paths."""
@@ -31,6 +35,7 @@ def setup(app):
     app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
 
     # Warn if a prerelease version of the theme is used
+
     parsed_version = pkg_resources.parse_version(__version__)
     if parsed_version.is_prerelease:
         logger.warning(_('You are using a pre-release version (%s) of sphinx-rtd-theme.'), __version__)
@@ -41,4 +46,4 @@ def setup(app):
         # Add Sphinx message catalog for newer versions of Sphinx
         # See http://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_message_catalog
         rtd_locale_path = path.join(path.abspath(path.dirname(__file__)), 'locale')
-        app.add_message_catalog(MESSAGE_CATALOG_NAME, rtd_locale_path)
+        app.add_message_catalog('sphinx', rtd_locale_path)