remove lint

Author: mcflugen

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

docs/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # standard_names documentation build configuration file, created by
 # sphinx-quickstart on Fri Jul 22 11:31:51 2016.
@@ -12,9 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
-import shlex
+import sys
 
 sys.path.insert(
     0, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
@@ -217,14 +215,14 @@
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
-    # Latex figure (float) alignment
-    #'figure_align': 'htbp',
+    #  The paper size ('letterpaper' or 'a4paper').
+    # 'papersize': 'letterpaper',
+    #  The font size ('10pt', '11pt' or '12pt').
+    # 'pointsize': '10pt',
+    #  Additional stuff for the LaTeX preamble.
+    # 'preamble': '',
+    #  Latex figure (float) alignment
+    # 'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

docs/source/index.rst

@@ -109,4 +109,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-

standard_names/__init__.py

@@ -1,9 +1,11 @@
 """The CSDMS Standard Names"""
 from importlib.metadata import version
 
-from .error import BadNameError, BadRegistryError
+from .error import BadNameError
+from .error import BadRegistryError
 from .registry import NamesRegistry
-from .standardname import StandardName, is_valid_name
+from .standardname import StandardName
+from .standardname import is_valid_name
 
 __version__ = version("standard-names")
 __all__ = [

standard_names/cmd/snbuild.py

@@ -4,7 +4,6 @@
     snbuild data/models.yaml data/scraped.yaml \
             > standard_names/data/standard_names.yaml
 """
-from __future__ import print_function
 
 import os
 
@@ -31,7 +30,7 @@ def snbuild(file, newline=None):
     --------
     >>> from __future__ import print_function
     >>> import os
-    >>> from six.moves import StringIO
+    >>> from io import StringIO
     >>> import standard_names as csn
 
     >>> lines = os.linesep.join(['air__temperature', 'water__temperature'])

standard_names/cmd/sndump.py

@@ -3,7 +3,6 @@
 Example usage:
     sndump -n -o -q -op --format=wiki > standard_names.wiki
 """
-from __future__ import print_function
 
 import argparse
 import os
@@ -34,7 +33,7 @@ def sndump(file=None, format="plain", sorted=True, keys=None, newline=None):
     --------
     >>> from __future__ import print_function
     >>> import os
-    >>> from six.moves import StringIO
+    >>> from io import StringIO
     >>> import standard_names as csn
 
     >>> lines = os.linesep.join(['air__temperature', 'water__temperature'])
@@ -72,10 +71,10 @@ class CustomAction(argparse.Action):
 
     def __call__(self, parser, namespace, values, option_string=None):
         if "ordered_args" not in namespace:
-            setattr(namespace, "ordered_args", [])
+            namespace.ordered_args = []
         previous = namespace.ordered_args
         previous.append(self.dest)
-        setattr(namespace, "ordered_args", previous)
+        namespace.ordered_args = previous
 
 
 def main(args=None):

standard_names/cmd/snscrape.py

@@ -6,11 +6,12 @@
              http://csdms.colorado.edu/wiki/CSN_Operation_Templates \
             > data/scraped.yaml
 """
-from __future__ import print_function
 
 import os
 
-from ..utilities import FORMATTERS, SCRAPERS, scrape
+from ..utilities import FORMATTERS
+from ..utilities import SCRAPERS
+from ..utilities import scrape
 
 _AS_TXT = FORMATTERS["txt"]
 
@@ -41,7 +42,7 @@ def snscrape(files, with_headers=False, regex=None, format="url", newline=None):
     Examples
     --------
     >>> from __future__ import print_function
-    >>> from six.moves import StringIO
+    >>> from io import StringIO
     >>> import standard_names as csn
 
     >>> file1 = StringIO(\"\"\"

standard_names/cmd/snsql.py

@@ -1,5 +1,4 @@
 #! /usr/bin/env python
-from __future__ import print_function
 
 import os
 

standard_names/cmd/snvalidate.py

@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 """Validate a list of names."""
-from __future__ import print_function
 
 import argparse
 import os

standard_names/error.py

@@ -13,7 +13,7 @@ class BadNameError(Error):
     """Error to indicate a poorly-formed standard name."""
 
     def __init__(self, name):
-        super(BadNameError, self).__init__()
+        super().__init__()
         self._name = name
 
     def __str__(self):
@@ -29,7 +29,7 @@ class BadRegistryError(Error):
     """Error to indicate a bad NamesRegistry."""
 
     def __init__(self, names):
-        super(BadRegistryError, self).__init__()
+        super().__init__()
         self._names = tuple(sorted(names))
 
     def __str__(self):

standard_names/registry.py

@@ -1,11 +1,9 @@
-#! /usr/bin/env python
 import os
 import warnings
 from glob import glob
 
-from six import string_types
-
-from .error import BadNameError, BadRegistryError
+from .error import BadNameError
+from .error import BadRegistryError
 from .standardname import StandardName
 
 
@@ -27,7 +25,7 @@ def load_names_from_txt(file_like, onerror="raise"):
 
     Examples
     --------
-    >>> from six.moves import StringIO
+    >>> from io import StringIO
     >>> import standard_names as csn
     >>> names = StringIO(\"\"\"
     ... air__temperature
@@ -55,20 +53,21 @@ def load_names_from_txt(file_like, onerror="raise"):
     if bad_names:
         if onerror == "warn":
             for name in bad_names:
-                warnings.warn("{name}: not a valid name".format(name=name))
+                warnings.warn(f"{name}: not a valid name", stacklevel=2)
         elif onerror == "raise":
             raise BadRegistryError(bad_names)
 
     return names
 
 
 def _strict_version_or_raise(version_str):
-    from packaging.version import InvalidVersion, Version
+    from packaging.version import InvalidVersion
+    from packaging.version import Version
 
     try:
         return Version(version_str)
-    except InvalidVersion:
-        raise ValueError("{version}: Not a version string".format(version=version_str))
+    except InvalidVersion as error:
+        raise ValueError(f"{version_str}: Not a version string") from error
 
 
 def _get_latest_names_file(path=None, prefix="names-", suffix=".txt"):
@@ -108,7 +107,7 @@ def _get_latest_names_file(path=None, prefix="names-", suffix=".txt"):
     """
     data_dir = path or os.path.join(os.path.dirname(__file__), "data")
 
-    name_glob = "{prefix}*{suffix}".format(prefix=prefix, suffix=suffix)
+    name_glob = f"{prefix}*{suffix}"
     data_file_pattern = os.path.join(data_dir, name_glob)
     files = [os.path.basename(file_) for file_ in glob(data_file_pattern)]
 
@@ -136,7 +135,7 @@ def _get_latest_names_file(path=None, prefix="names-", suffix=".txt"):
         return None, None
 
 
-class NamesRegistry(object):
+class NamesRegistry:
 
     """A registry of CSDMS Standard Names.
 
@@ -221,7 +220,7 @@ def __init__(self, *args, **kwds):
         if paths is None:
             paths = []
 
-        if isinstance(paths, string_types) or hasattr(paths, "readline"):
+        if isinstance(paths, str) or hasattr(paths, "readline"):
             paths = [paths]
 
         self._names = set()
@@ -232,8 +231,8 @@ def __init__(self, *args, **kwds):
         self._version = version or "0.0.0"
 
         for path in paths:
-            if isinstance(path, string_types):
-                with open(path, "r") as fp:
+            if isinstance(path, str):
+                with open(path) as fp:
                     self._load(fp)
             else:
                 self._load(path)
@@ -339,8 +338,7 @@ def __len__(self):
         return len(self._names)
 
     def __iter__(self):
-        for name in self._names:
-            yield name
+        yield from self._names
 
     def search(self, name):
         """Search the registry for a name.
@@ -395,7 +393,7 @@ def names_with(self, parts):
         tuple of str
             Names from the registry that contains the given words.
         """
-        if isinstance(parts, string_types):
+        if isinstance(parts, str):
             parts = (parts,)
 
         remaining_names = self._names

standard_names/standardname.py

@@ -2,8 +2,6 @@
 """A CSDMS standard name."""
 import re
 
-from six import string_types
-
 from .error import BadNameError
 
 _PREFIX_REGEX = "^[a-z]([a-zA-Z0-9~-]|_(?!_))*"
@@ -28,7 +26,7 @@ def is_valid_name(name):
     return bool(STANDARD_NAME_REGEX.match(name))
 
 
-class StandardName(object):
+class StandardName:
 
     """A CSDMS standard name.
 
@@ -111,8 +109,8 @@ def decompose_name(name):
         """
         try:
             (object_part, quantity_clause) = name.split("__")
-        except ValueError:
-            raise BadNameError(name)
+        except ValueError as error:
+            raise BadNameError(name) from error
 
         (operators, quantity_part) = StandardName.decompose_quantity(quantity_clause)
 
@@ -214,7 +212,7 @@ def operators(self):
 
     @operators.setter
     def operators(self, value):
-        if isinstance(value, string_types):
+        if isinstance(value, str):
             value = (value,)
         self._operators = value
         self._name = StandardName.compose_name(

standard_names/utilities/__init__.py

@@ -1,5 +1,13 @@
-from .decorators import format_as_wiki, format_as_yaml, google_doc, plain_text, url
-from .io import FORMATTERS, SCRAPERS, from_list_file, from_model_file, scrape
+from .decorators import format_as_wiki
+from .decorators import format_as_yaml
+from .decorators import google_doc
+from .decorators import plain_text
+from .decorators import url
+from .io import FORMATTERS
+from .io import SCRAPERS
+from .io import from_list_file
+from .io import from_model_file
+from .io import scrape
 
 __all__ = [
     "format_as_wiki",

standard_names/utilities/decorators.py

@@ -3,8 +3,6 @@
 
 import os
 
-from six import string_types
-
 
 def format_as_wiki(func):
     """
@@ -52,7 +50,7 @@ def _wrapped(lines, **kwds):
 
         if heading:
             pre = "=" * heading_level
-            wiki_lines.insert(0, "%s %s %s" % (pre, heading.title(), pre))
+            wiki_lines.insert(0, f"{pre} {heading.title()} {pre}")
 
         return newline.join(wiki_lines)
 
@@ -114,7 +112,7 @@ def _wrapped(lines, **kwds):
         items = [line for line in lines if line]
         if items:
             for line in items:
-                yaml_lines.append("%s- %s" % (" " * indent, line))
+                yaml_lines.append("{}- {}".format(" " * indent, line))
         else:
             yaml_lines.append("%s[]" % (" " * indent))
 
@@ -176,8 +174,8 @@ def _wrapped(name, **kwds):
         name : str
             Name of the file as a string.
         """
-        if isinstance(name, string_types):
-            with open(name, "r") as file_like:
+        if isinstance(name, str):
+            with open(name) as file_like:
                 rtn = func(file_like, **kwds)
         else:
             rtn = func(name, **kwds)
@@ -233,7 +231,7 @@ def _wrapped(name, **kwds):
         except subprocess.CalledProcessError:
             raise
         else:
-            with open(tfile, "r") as file_like:
+            with open(tfile) as file_like:
                 rtn = func(file_like, **kwds)
         finally:
             os.remove(tfile)