style: applied pyupgrade --py37-plus aw_core/**.py aw_datastore/**.py aw_query/**.py aw_transform/**.py

Author: ErikBjare

aw_core/config.py

@@ -41,14 +41,14 @@ def load_config_toml(
     appname: str, default_config: str
 ) -> Union[dict, tomlkit.container.Container]:
     config_dir = dirs.get_config_dir(appname)
-    config_file_path = os.path.join(config_dir, "{}.toml".format(appname))
+    config_file_path = os.path.join(config_dir, f"{appname}.toml")
 
     # Run early to ensure input is valid toml before writing
     default_config_toml = tomlkit.parse(default_config)
 
     # Override defaults from existing config file
     if os.path.isfile(config_file_path):
-        with open(config_file_path, "r") as f:
+        with open(config_file_path) as f:
             config = f.read()
         config_toml = tomlkit.parse(config)
     else:
@@ -67,7 +67,7 @@ def save_config_toml(appname: str, config: str) -> None:
     assert tomlkit.parse(config)
 
     config_dir = dirs.get_config_dir(appname)
-    config_file_path = os.path.join(config_dir, "{}.toml".format(appname))
+    config_file_path = os.path.join(config_dir, f"{appname}.toml")
 
     with open(config_file_path, "w") as f:
         f.write(config)
@@ -86,11 +86,11 @@ def load_config(appname, default_config):
     config = default_config
 
     config_dir = dirs.get_config_dir(appname)
-    config_file_path = os.path.join(config_dir, "{}.toml".format(appname))
+    config_file_path = os.path.join(config_dir, f"{appname}.toml")
 
     # Override defaults from existing config file
     if os.path.isfile(config_file_path):
-        with open(config_file_path, "r") as f:
+        with open(config_file_path) as f:
             config.read_file(f)
 
     # Overwrite current config file (necessary in case new default would be added)
@@ -106,7 +106,7 @@ def load_config(appname, default_config):
 )
 def save_config(appname, config):
     config_dir = dirs.get_config_dir(appname)
-    config_file_path = os.path.join(config_dir, "{}.ini".format(appname))
+    config_file_path = os.path.join(config_dir, f"{appname}.ini")
     with open(config_file_path, "w") as f:
         config.write(f)
         # Flush and fsync to lower risk of corrupted files

aw_core/decorators.py

@@ -44,7 +44,7 @@ def g(*args, **kwargs):
             except exception as e:
                 # TODO: Use warnings module instead?
                 logging.error(
-                    "{} crashed due to exception, restarting.".format(f.__name__)
+                    f"{f.__name__} crashed due to exception, restarting."
                 )
                 logging.error(e)
                 time.sleep(

aw_core/log.py

@@ -141,7 +141,7 @@ def _create_json_formatter() -> logging.Formatter:  # pragma: no cover
 
     def log_format(x):
         """Used to give JsonFormatter proper parameter format"""
-        return ["%({0:s})".format(i) for i in x]
+        return [f"%({i:s})" for i in x]
 
     custom_format = " ".join(log_format(supported_keys))
 

aw_core/models.py

@@ -30,7 +30,7 @@ def _timestamp_parse(ts_in: ConvertableTimestamp) -> datetime:
     if not ts.tzinfo:
         # Needed? All timestamps should be iso8601 so ought to always contain timezone.
         # Yes, because it is optional in iso8601
-        logger.warning("timestamp without timezone found, using UTC: {}".format(ts))
+        logger.warning(f"timestamp without timezone found, using UTC: {ts}")
         ts = ts.replace(tzinfo=timezone.utc)
     return ts
 
@@ -137,5 +137,5 @@ def duration(self, duration: Duration) -> None:
             self["duration"] = timedelta(seconds=duration)  # type: ignore
         else:
             raise TypeError(
-                "Couldn't parse duration of invalid type {}".format(type(duration))
+                f"Couldn't parse duration of invalid type {type(duration)}"
             )

aw_core/util.py

@@ -22,4 +22,4 @@ def assert_version(required_version: Tuple[int, ...] = (3, 5)):  # pragma: no co
                 + " version to at least {}."
             ).format(required_version)
         )
-    logger.debug("Python version: {}".format(_version_info_tuple()))
+    logger.debug(f"Python version: {_version_info_tuple()}")

aw_datastore/benchmark.py

@@ -59,14 +59,14 @@ def benchmark(storage: Callable[..., AbstractStorage]):
 
     with temporary_bucket(ds) as bucket:
         with ttt(" sum"):
-            with ttt(" single insert {} events".format(num_single_events)):
+            with ttt(f" single insert {num_single_events} events"):
                 for event in single_events:
                     bucket.insert(event)
 
-            with ttt(" bulk insert {} events".format(num_bulk_events)):
+            with ttt(f" bulk insert {num_bulk_events} events"):
                 bucket.insert(bulk_events)
 
-            with ttt(" replace last {}".format(num_replace_events)):
+            with ttt(f" replace last {num_replace_events}"):
                 for e in replace_events:
                     bucket.replace_last(e)
 

aw_datastore/datastore.py

@@ -52,14 +52,14 @@ def create_bucket(
         created: datetime = datetime.now(timezone.utc),
         name: Optional[str] = None,
     ) -> "Bucket":
-        self.logger.info("Creating bucket '{}'".format(bucket_id))
+        self.logger.info(f"Creating bucket '{bucket_id}'")
         self.storage_strategy.create_bucket(
             bucket_id, type, client, hostname, created.isoformat(), name=name
         )
         return self[bucket_id]
 
     def delete_bucket(self, bucket_id: str):
-        self.logger.info("Deleting bucket '{}'".format(bucket_id))
+        self.logger.info(f"Deleting bucket '{bucket_id}'")
         if bucket_id in self.bucket_instances:
             del self.bucket_instances[bucket_id]
         return self.storage_strategy.delete_bucket(bucket_id)

aw_datastore/migration.py

@@ -23,7 +23,7 @@ def detect_db_files(
         db_files = [
             filename
             for filename in db_files
-            if filename.split(".")[1] == "v{}".format(version)
+            if filename.split(".")[1] == f"v{version}"
         ]
     return db_files
 
@@ -49,7 +49,7 @@ def peewee_v2_to_sqlite_v1(datastore):
     buckets = pw_db.buckets()
     # Insert buckets and events to new db
     for bucket_id in buckets:
-        logger.info("Migrating bucket {}".format(bucket_id))
+        logger.info(f"Migrating bucket {bucket_id}")
         bucket = buckets[bucket_id]
         datastore.create_bucket(
             bucket["id"],

aw_datastore/storages/peewee.py

@@ -117,13 +117,13 @@ def __init__(self, testing: bool = True, filepath: str = None) -> None:
             filename = (
                 "peewee-sqlite"
                 + ("-testing" if testing else "")
-                + ".v{}".format(LATEST_VERSION)
+                + f".v{LATEST_VERSION}"
                 + ".db"
             )
             filepath = os.path.join(data_dir, filename)
         self.db = _db
         self.db.init(filepath)
-        logger.info("Using database file: {}".format(filepath))
+        logger.info(f"Using database file: {filepath}")
 
         self.db.connect()
 

aw_datastore/storages/sqlite.py

@@ -67,12 +67,12 @@ def __init__(self, testing, filepath: str = None, enable_lazy_commit=True) -> No
         ds_name = self.sid + ("-testing" if testing else "")
         if not filepath:
             data_dir = get_data_dir("aw-server")
-            filename = ds_name + ".v{}".format(LATEST_VERSION) + ".db"
+            filename = ds_name + f".v{LATEST_VERSION}" + ".db"
             filepath = os.path.join(data_dir, filename)
 
         new_db_file = not os.path.exists(filepath)
         self.conn = sqlite3.connect(filepath)
-        logger.info("Using database file: {}".format(filepath))
+        logger.info(f"Using database file: {filepath}")
 
         # Create tables
         self.conn.execute(CREATE_BUCKETS_TABLE)