Run flynt to upgrade to f-strings

Author: hugovk

elasticsearch_dsl/analysis.py

@@ -26,7 +26,7 @@ class AnalysisBase:
     def _type_shortcut(cls, name_or_instance, type=None, **kwargs):
         if isinstance(name_or_instance, cls):
             if type or kwargs:
-                raise ValueError("%s() cannot accept parameters." % cls.__name__)
+                raise ValueError(f"{cls.__name__}() cannot accept parameters.")
             return name_or_instance
 
         if not (type or kwargs):

elasticsearch_dsl/connections.py

@@ -72,7 +72,7 @@ def remove_connection(self, alias):
                 errors += 1
 
         if errors == 2:
-            raise KeyError("There is no connection with alias %r." % alias)
+            raise KeyError(f"There is no connection with alias {alias!r}.")
 
     def create_connection(self, alias="default", **kwargs):
         """
@@ -108,7 +108,7 @@ def get_connection(self, alias="default"):
             return self.create_connection(alias, **self._kwargs[alias])
         except KeyError:
             # no connection and no kwargs to set one up
-            raise KeyError("There is no connection with alias %r." % alias)
+            raise KeyError(f"There is no connection with alias {alias!r}.")
 
 
 connections = Connections()

elasticsearch_dsl/document.py

@@ -275,7 +275,7 @@ def mget(
             raise RequestError(400, message, error_docs)
         if missing_docs:
             missing_ids = [doc["_id"] for doc in missing_docs]
-            message = "Documents %s not found." % ", ".join(missing_ids)
+            message = f"Documents {', '.join(missing_ids)} not found."
             raise NotFoundError(404, message, {"docs": missing_docs})
         return objs
 

elasticsearch_dsl/field.py

@@ -265,7 +265,7 @@ def _deserialize(self, data):
                 data = parser.parse(data)
             except Exception as e:
                 raise ValidationException(
-                    "Could not parse date from the value (%r)" % data, e
+                    f"Could not parse date from the value ({data!r})", e
                 )
 
         if isinstance(data, datetime):
@@ -278,7 +278,7 @@ def _deserialize(self, data):
             # Divide by a float to preserve milliseconds on the datetime.
             return datetime.utcfromtimestamp(data / 1000.0)
 
-        raise ValidationException("Could not parse date from the value (%r)" % data)
+        raise ValidationException(f"Could not parse date from the value ({data!r})")
 
 
 class Text(Field):

elasticsearch_dsl/function.py

@@ -38,7 +38,7 @@ def SF(name_or_sf, **params):
         elif len(sf) == 1:
             name, params = sf.popitem()
         else:
-            raise ValueError("SF() got an unexpected fields in the dictionary: %r" % sf)
+            raise ValueError(f"SF() got an unexpected fields in the dictionary: {sf!r}")
 
         # boost factor special case, see elasticsearch #6343
         if not isinstance(params, collections.abc.Mapping):

elasticsearch_dsl/search.py

@@ -86,7 +86,7 @@ class ProxyDescriptor:
     """
 
     def __init__(self, name):
-        self._attr_name = "_%s_proxy" % name
+        self._attr_name = f"_{name}_proxy"
 
     def __get__(self, instance, owner):
         return getattr(instance, self._attr_name)

elasticsearch_dsl/utils.py

@@ -151,19 +151,15 @@ def __getattr__(self, attr_name):
             return self.__getitem__(attr_name)
         except KeyError:
             raise AttributeError(
-                "{!r} object has no attribute {!r}".format(
-                    self.__class__.__name__, attr_name
-                )
+                f"{self.__class__.__name__!r} object has no attribute {attr_name!r}"
             )
 
     def __delattr__(self, attr_name):
         try:
             del self._d_[attr_name]
         except KeyError:
             raise AttributeError(
-                "{!r} object has no attribute {!r}".format(
-                    self.__class__.__name__, attr_name
-                )
+                f"{self.__class__.__name__!r} object has no attribute {attr_name!r}"
             )
 
     def __getitem__(self, key):
@@ -224,7 +220,7 @@ def get_dsl_type(cls, name):
         try:
             return cls._types[name]
         except KeyError:
-            raise UnknownDslObject("DSL type %s does not exist." % name)
+            raise UnknownDslObject(f"DSL type {name} does not exist.")
 
 
 class DslBase(metaclass=DslMeta):
@@ -266,7 +262,7 @@ def __init__(self, _expand__to_dot=EXPAND__TO_DOT, **params):
     def _repr_params(self):
         """Produce a repr of all our parameters to be used in __repr__."""
         return ", ".join(
-            "{}={!r}".format(n.replace(".", "__"), v)
+            f"{n.replace('.', '__')}={v!r}"
             for (n, v) in sorted(self._params.items())
             # make sure we don't include empty typed params
             if "type" not in self._param_defs.get(n, {}) or v
@@ -319,9 +315,7 @@ def _setattr(self, name, value):
     def __getattr__(self, name):
         if name.startswith("_"):
             raise AttributeError(
-                "{!r} object has no attribute {!r}".format(
-                    self.__class__.__name__, name
-                )
+                f"{self.__class__.__name__!r} object has no attribute {name!r}"
             )
 
         value = None
@@ -338,9 +332,7 @@ def __getattr__(self, name):
                     value = self._params.setdefault(name, {})
         if value is None:
             raise AttributeError(
-                "{!r} object has no attribute {!r}".format(
-                    self.__class__.__name__, name
-                )
+                f"{self.__class__.__name__!r} object has no attribute {name!r}"
             )
 
         # wrap nested dicts in AttrDict for convenient access
@@ -541,9 +533,7 @@ def merge(data, new_data, raise_on_conflict=False):
         and isinstance(new_data, (AttrDict, collections.abc.Mapping))
     ):
         raise ValueError(
-            "You can only merge two dicts! Got {!r} and {!r} instead.".format(
-                data, new_data
-            )
+            f"You can only merge two dicts! Got {data!r} and {new_data!r} instead."
         )
 
     for key, value in new_data.items():
@@ -554,7 +544,7 @@ def merge(data, new_data, raise_on_conflict=False):
         ):
             merge(data[key], value, raise_on_conflict)
         elif key in data and data[key] != value and raise_on_conflict:
-            raise ValueError("Incompatible data for key %r, cannot be merged." % key)
+            raise ValueError(f"Incompatible data for key {key!r}, cannot be merged.")
         else:
             data[key] = value
 

elasticsearch_dsl/wrappers.py

@@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
 
         for k in data:
             if k not in self.OPS:
-                raise ValueError("Range received an unknown operator %r" % k)
+                raise ValueError(f"Range received an unknown operator {k!r}")
 
         if "gt" in data and "gte" in data:
             raise ValueError("You cannot specify both gt and gte for Range.")

tests/test_result.py

@@ -89,7 +89,7 @@ def test_interactive_helpers(dummy_response):
     )
 
     assert res
-    assert "<Response: %s>" % rhits == repr(res)
+    assert f"<Response: {rhits}>" == repr(res)
     assert rhits == repr(hits)
     assert {"meta", "city", "name"} == set(dir(h))
     assert "<Hit(test-index/elasticsearch): %r>" % dummy_response["hits"]["hits"][0][