Remove junk; remove unnecessary variable

Author: sloria

docs/conf.py

@@ -1,34 +1,13 @@
-#
-# marshmallow documentation build configuration file.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
 from collections import OrderedDict
 import sys
 import os
 import datetime as dt
 
 import alabaster
 
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath(os.path.join("..", "src")))
 import marshmallow  # noqa: E402
 
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.intersphinx",
@@ -45,15 +24,11 @@
 
 issues_github_path = "marshmallow-code/marshmallow"
 
-# Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
 
-# The suffix of source filenames.
 source_suffix = ".rst"
-# The master toctree document.
 master_doc = "index"
 
-# General information about the project.
 project = "marshmallow"
 copyright = ' {:%Y} <a href="https://stevenloria.com">Steven Loria</a> and contributors'.format(
     dt.datetime.utcfromtimestamp(os.path.getmtime("../CHANGELOG.rst"))

src/marshmallow/fields.py

@@ -58,11 +58,6 @@
     "Pluck",
 ]
 
-MISSING_ERROR_MESSAGE = (
-    "ValidationError raised by `{class_name}`, but error key `{key}` does "
-    "not exist in the `error_messages` dictionary."
-)
-
 
 class Field(FieldABC):
     """Basic field from which other fields should extend. It applies no
@@ -256,8 +251,11 @@ def make_error(self, key: str, **kwargs) -> ValidationError:
             msg = self.error_messages[key]
         except KeyError as error:
             class_name = self.__class__.__name__
-            msg = MISSING_ERROR_MESSAGE.format(class_name=class_name, key=key)
-            raise AssertionError(msg) from error
+            message = (
+                "ValidationError raised by `{class_name}`, but error key `{key}` does "
+                "not exist in the `error_messages` dictionary."
+            ).format(class_name=class_name, key=key)
+            raise AssertionError(message) from error
         if isinstance(msg, (str, bytes)):
             msg = msg.format(**kwargs)
         return ValidationError(msg)

tests/test_schema.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import datetime as dt
 import decimal
 import random