Remove now-unnecessary string literal concatenation.

black puts two string literals on the same line when they fit, and its
style (for exceptions especially) often means they now do even if they
didn't before.  So we can now remove these concatentations in favor of
single longer literals.

Author: TallJimbo

python/lsst/pipe/base/argumentParser.py

@@ -476,13 +476,13 @@ def __init__(self, name, usage="%(prog)s input [options]", **kwargs):
         self.add_argument(
             "--output",
             dest="rawOutput",
-            help="path to output data repository (need not exist), " f"relative to ${DEFAULT_OUTPUT_NAME}",
+            help=f"path to output data repository (need not exist), relative to ${DEFAULT_OUTPUT_NAME}",
         )
         self.add_argument(
             "--rerun",
             dest="rawRerun",
             metavar="[INPUT:]OUTPUT",
-            help="rerun name: sets OUTPUT to ROOT/rerun/OUTPUT; " "optionally sets ROOT to ROOT/rerun/INPUT",
+            help="rerun name: sets OUTPUT to ROOT/rerun/OUTPUT; optionally sets ROOT to ROOT/rerun/INPUT",
         )
         self.add_argument(
             "-c",

python/lsst/pipe/base/config.py

@@ -111,7 +111,7 @@ def __new__(cls, name, bases, dct, **kwargs):
             configConnectionsNamespace = {}
             for fieldName, obj in connectionsClass.allConnections.items():
                 configConnectionsNamespace[fieldName] = pexConfig.Field(
-                    dtype=str, doc=f"name for " f"connection {fieldName}", default=obj.name
+                    dtype=str, doc=f"name for connection {fieldName}", default=obj.name
                 )
             # If there are default templates also add them as fields to
             # configure the template values
@@ -130,7 +130,7 @@ def __new__(cls, name, bases, dct, **kwargs):
             # add it to the Config class that is currently being declared
             dct["connections"] = pexConfig.ConfigField(
                 dtype=Connections,
-                doc="Configurations describing the" " connections of the PipelineTask to datatypes",
+                doc="Configurations describing the connections of the PipelineTask to datatypes",
             )
             dct["ConnectionsConfigClass"] = Connections
             dct["ConnectionsClass"] = connectionsClass

python/lsst/pipe/base/connectionTypes.py

@@ -153,7 +153,7 @@ class DimensionedConnection(BaseConnection):
     def __post_init__(self):
         if isinstance(self.dimensions, str):
             raise TypeError(
-                "Dimensions must be iterable of dimensions, got str," "possibly omitted trailing comma"
+                "Dimensions must be iterable of dimensions, got str, possibly omitted trailing comma"
             )
         if not isinstance(self.dimensions, typing.Iterable):
             raise TypeError("Dimensions must be iterable of dimensions")

python/lsst/pipe/base/connections.py

@@ -407,7 +407,7 @@ def __init__(self, *, config: "PipelineTaskConfig" = None):
 
         if config is None or not isinstance(config, PipelineTaskConfig):
             raise ValueError(
-                "PipelineTaskConnections must be instantiated with" " a PipelineTaskConfig instance"
+                "PipelineTaskConnections must be instantiated with a PipelineTaskConfig instance"
             )
         self.config = config
         # Extract the template names that were defined in the config instance
@@ -496,7 +496,7 @@ def buildDatasetRefs(
                 # to handle, throw
                 else:
                     raise ValueError(
-                        f"Attribute with name {attributeName} has no counterpoint " "in input quantum"
+                        f"Attribute with name {attributeName} has no counterpoint in input quantum"
                     )
         return inputDatasetRefs, outputDatasetRefs
 

python/lsst/pipe/base/graph/_implDetails.py

@@ -79,9 +79,7 @@ def addProducer(self, key: _T, value: _U):
             Raised if key is already declared to be produced by another value
         """
         if (existing := self._producers.get(key)) is not None and existing != value:
-            raise ValueError(
-                f"Only one node is allowed to produce {key}, " f"the current producer is {existing}"
-            )
+            raise ValueError(f"Only one node is allowed to produce {key}, the current producer is {existing}")
         self._producers[key] = value
         if self._createInverse:
             self._itemsDict[value].add(key)

python/lsst/pipe/base/graph/_loadHelpers.py

@@ -241,7 +241,7 @@ def load(
             remainder = nodes - self.headerInfo.map.keys()
             if remainder:
                 raise ValueError(
-                    f"Nodes {remainder} were requested, but could not be found in the input " "graph"
+                    f"Nodes {remainder} were requested, but could not be found in the input graph"
                 )
             _readBytes = self._readBytes
         return self.deserializer.constructGraph(nodes, _readBytes, universe)

python/lsst/pipe/base/graphBuilder.py

@@ -613,7 +613,7 @@ def connectDataIds(
             queryArgs["collections"] = collections
         else:
             raise ValueError(
-                f"Unable to handle type {datasetQueryConstraint} given as " "datasetQueryConstraint."
+                f"Unable to handle type {datasetQueryConstraint} given as datasetQueryConstraint."
             )
 
         with registry.queryDataIds(**queryArgs).materialize() as commonDataIds:

python/lsst/pipe/base/pipeTools.py

@@ -97,7 +97,7 @@ def isPipelineOrdered(pipeline, taskFactory=None):
         for attr in iterConnections(taskDef.connections, "outputs"):
             if attr.name in producerIndex:
                 raise DuplicateOutputError(
-                    "DatasetType `{}' appears more than " "once as output".format(attr.name)
+                    "DatasetType `{}' appears more than once as output".format(attr.name)
                 )
             producerIndex[attr.name] = idx
 
@@ -152,7 +152,7 @@ def orderPipeline(pipeline):
         for dsTypeDescr in dsMap.values():
             if dsTypeDescr.name in allOutputs:
                 raise DuplicateOutputError(
-                    "DatasetType `{}' appears more than " "once as output".format(dsTypeDescr.name)
+                    "DatasetType `{}' appears more than once as output".format(dsTypeDescr.name)
                 )
         outputs[idx] = set(dsTypeDescr.name for dsTypeDescr in dsMap.values())
         allOutputs.update(outputs[idx])

python/lsst/pipe/base/pipeline.py

@@ -96,7 +96,7 @@ class LabelSpecifier:
     def __post_init__(self):
         if self.labels is not None and (self.begin or self.end):
             raise ValueError(
-                "This struct can only be initialized with a labels set or " "a begin (and/or) end specifier"
+                "This struct can only be initialized with a labels set or a begin (and/or) end specifier"
             )
 
 
@@ -340,7 +340,7 @@ def subsetFromLabels(self, labelSpecifier: LabelSpecifier) -> Pipeline:
             if labelSpecifier.end is not None:
                 if labelSpecifier.end not in labels:
                     raise ValueError(
-                        f"End of range subset, {labelSpecifier.end}, not found in pipeline " "definition"
+                        f"End of range subset, {labelSpecifier.end}, not found in pipeline definition"
                     )
 
             labelSet = set()
@@ -381,7 +381,7 @@ def _parse_file_specifier(uri: Union[str, ButlerURI]) -> Tuple[ButlerURI, Option
             if "," in label_subset:
                 if ".." in label_subset:
                     raise ValueError(
-                        "Can only specify a list of labels or a range" "when loading a Pipline not both"
+                        "Can only specify a list of labels or a rangewhen loading a Pipline not both"
                     )
                 args = {"labels": set(label_subset.split(","))}
             # labels supplied as a range
@@ -634,7 +634,7 @@ def _toExpandedPipelineImpl(self, checkContracts=True) -> Iterable[TaskDef]:
                 if not success:
                     extra_info = f": {contract.msg}" if contract.msg is not None else ""
                     raise pipelineIR.ContractError(
-                        f"Contract(s) '{contract.contract}' were not " f"satisfied{extra_info}"
+                        f"Contract(s) '{contract.contract}' were not satisfied{extra_info}"
                     )
 
         taskDefs = sorted(taskDefs, key=lambda x: x.label)

python/lsst/pipe/base/pipelineIR.py

@@ -59,7 +59,7 @@ def construct_mapping(self, node, deep=False):
         duplicates = {k for k, i in all_keys.items() if i != 1}
         if duplicates:
             raise KeyError(
-                "Pipeline files must not have duplicated keys, " f"{duplicates} appeared multiple times"
+                f"Pipeline files must not have duplicated keys, {duplicates} appeared multiple times"
             )
         return mapping
 
@@ -143,7 +143,7 @@ def from_primitives(label: str, value: Union[List[str], dict]) -> LabeledSubset:
             subset = value.pop("subset", None)
             if subset is None:
                 raise ValueError(
-                    "If a labeled subset is specified as a mapping, it must contain the key " "'subset'"
+                    "If a labeled subset is specified as a mapping, it must contain the key 'subset'"
                 )
             description = value.pop("description", None)
         elif isinstance(value, abcIterable):
@@ -427,7 +427,7 @@ def toPipelineIR(self) -> "PipelineIR":
         """
         if self.include and self.exclude:
             raise ValueError(
-                "Both an include and an exclude list cant be specified" " when declaring a pipeline import"
+                "Both an include and an exclude list cant be specified when declaring a pipeline import"
             )
         tmp_pipeline = PipelineIR.from_uri(os.path.expandvars(self.location))
         if self.instrument is not KeepInstrument:
@@ -675,7 +675,7 @@ def process_args(argument: Union[str, dict]) -> dict:
         # from this pipeline
         if accumulate_labeled_subsets.keys() & self.tasks.keys():
             raise ValueError(
-                "Labeled subset names must be unique amongst imports in both labels and " " named Subsets"
+                "Labeled subset names must be unique amongst imports in both labels and  named Subsets"
             )
         # merge in the named subsets for self so this document can override any
         # that have been delcared