Browse Source

Merge pull request #2820 from drfloob/bug/latexpdf-errors

fix build errors with `make latexpdf`
Rémi Verschelde 5 years ago
parent
commit
6a4db97e0d
2 changed files with 5 additions and 2 deletions
  1. 2 1
      conf.py
  2. 3 1
      extensions/sphinx_tabs/tabs.py

+ 2 - 1
conf.py

@@ -11,7 +11,8 @@ needs_sphinx = '1.3'
 
 
 # Sphinx extension module names and templates location
 # Sphinx extension module names and templates location
 sys.path.append(os.path.abspath('extensions'))
 sys.path.append(os.path.abspath('extensions'))
-extensions = ['gdscript', 'sphinx_tabs.tabs', 'sphinx.ext.imgmath']
+extensions = ['gdscript', 'sphinx_tabs.tabs', 'sphinx.ext.imgmath', 'sphinx.ext.imgconverter']
+
 templates_path = ['_templates']
 templates_path = ['_templates']
 
 
 # You can specify multiple suffix as a list of string: ['.rst', '.md']
 # You can specify multiple suffix as a list of string: ['.rst', '.md']

+ 3 - 1
extensions/sphinx_tabs/tabs.py

@@ -291,14 +291,16 @@ def copy_assets(app, exception):
     """ Copy asset files to the output """
     """ Copy asset files to the output """
     if 'getLogger' in dir(logging):
     if 'getLogger' in dir(logging):
         log = logging.getLogger(__name__).info  # pylint: disable=no-member
         log = logging.getLogger(__name__).info  # pylint: disable=no-member
+        warn = logging.getLogger(__name__).warning  # pylint: disable=no-member
     else:
     else:
         log = app.info
         log = app.info
+        warn = app.warn
     builders = get_compatible_builders(app)
     builders = get_compatible_builders(app)
     if exception:
     if exception:
         return
         return
     if app.builder.name not in builders:
     if app.builder.name not in builders:
         if not app.config['sphinx_tabs_nowarn']:
         if not app.config['sphinx_tabs_nowarn']:
-            app.warn(
+            warn(
                 'Not copying tabs assets! Not compatible with %s builder' %
                 'Not copying tabs assets! Not compatible with %s builder' %
                 app.builder.name)
                 app.builder.name)
         return
         return