Merge pull request #211 from bsipocz/MAINT_minor_cleanup

MAINT: minor updates

Author: pllim

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # -- General configuration ------------------------------------------------
 from sphinx_automodapi import __version__

sphinx_automodapi/automodapi.py

@@ -324,7 +324,7 @@ def automodapi_replace(sourcestr, app, dotoctree=True, docname=None,
 
             # add automodule directive only if no-main-docstr isn't present
             if maindocstr:
-                automodline = '.. automodule:: {modname}'.format(modname=modnm)
+                automodline = f'.. automodule:: {modnm}'
             else:
                 automodline = ''
             if top_head:
@@ -409,7 +409,7 @@ def automodapi_replace(sourcestr, app, dotoctree=True, docname=None,
             if docname is None:
                 with open(os.path.join(app.srcdir, 'unknown.automodapi'),
                           'a', encoding='utf8') as f:
-                    f.write(u'\n**NEW DOC**\n\n')
+                    f.write('\n**NEW DOC**\n\n')
                     f.write(ustr)
             else:
                 env = app.builder.env

sphinx_automodapi/automodsumm.py

@@ -535,7 +535,7 @@ def generate_automodsumm_docs(lines, srcfn, app=None, suffix='.rst',
         try:
             import_by_name_values = import_by_name(name)
         except ImportError as e:
-            logger.warning('[automodsumm] failed to import %r: %s' % (name, e))
+            logger.warning('[automodsumm] failed to import {!r}: {}'.format(name, e))
             continue
 
         # if block to accommodate Sphinx's v1.2.2 and v1.2.3 respectively

sphinx_automodapi/tests/__init__.py

@@ -27,7 +27,7 @@ def pilot():
     test_pkg.join('setup.py').write(dedent("""\
         import sys
 
-        sys.path.insert(0, {0!r})
+        sys.path.insert(0, {!r})
 
         from os.path import join
         from setuptools import setup, Extension

sphinx_automodapi/tests/example_module/attribute_class.py

@@ -1,4 +1,4 @@
-class ClassWithAttribute(object):
+class ClassWithAttribute:
     """A class with an attribute."""
     my_attribute = 1
 

sphinx_automodapi/tests/example_module/classes.py

@@ -1,7 +1,7 @@
 __all__ = ['Spam', 'Egg']
 
 
-class BaseSpam(object):
+class BaseSpam:
     """
     Base class for Spam
     """
@@ -26,7 +26,7 @@ class Spam(BaseSpam):
     pass
 
 
-class Egg(object):
+class Egg:
     """
     An egg (no inheritance)
     """

sphinx_automodapi/tests/example_module/mixed.py

@@ -12,7 +12,7 @@ def add(a, b):
     return a + b
 
 
-class MixedSpam(object):
+class MixedSpam:
     """
     Special spam
     """

sphinx_automodapi/tests/example_module/nonascii.py

@@ -1,7 +1,7 @@
 __all__ = ['NonAsciiÄöüßő']
 
 
-class NonAsciiÄöüßő(object):
+class NonAsciiÄöüßő:
     def get_äöü(self):
         """
         Return a string with common umlauts like äöüß

sphinx_automodapi/tests/example_module/other_classes.py

@@ -1,7 +1,7 @@
 __all__ = ['Foo']
 
 
-class BaseFoo(object):
+class BaseFoo:
     """
     Base class for Foo
     """

sphinx_automodapi/tests/example_module/slots.py

@@ -12,7 +12,7 @@
 __all__ = ['SlotDict', 'DerivedParam', 'DerivedSlotParam',]
 
 
-class SlotDict(object):
+class SlotDict:
     """
     A class that uses __slots__ and __dict__ for its attribute namespace.
     """
@@ -72,7 +72,7 @@ def __init__(self, param: str, other_param: str, extra_param: str):
         extra_param : str
             An extra parameter
         """
-        super(DerivedParam, self).__init__(param, other_param)
+        super().__init__(param, other_param)
         self.extra_attr = extra_param
 
     def derived_from_slot_class_method(self):
@@ -104,7 +104,7 @@ def __init__(self, param: str, other_param: str, extra_param: str):
         extra_param : str
             An extra parameter
         """
-        super(DerivedSlotParam, self).__init__(param, other_param)
+        super().__init__(param, other_param)
         self.extra_attr = extra_param
 
     def derived_from_slot_class_method(self):