Merge pull request #925 from pimutils/pyupgrade

Set up pyupgrade

Author: Hugo Osvaldo Barrera

.pre-commit-config.yaml

@@ -22,6 +22,11 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.23.3
+    hooks:
+    -   id: pyupgrade
+        args: [--py37-plus]
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: "v0.910"
     hooks:

setup.cfg

@@ -1,6 +1,3 @@
-[wheel]
-universal = 1
-
 [tool:pytest]
 addopts =
   --tb=short

tests/storage/servers/davical/__init__.py

@@ -11,7 +11,7 @@
         "url": "https://brutus.lostpackets.de/davical-test/caldav.php/",
     }
 except KeyError as e:
-    pytestmark = pytest.mark.skip("Missing envkey: {}".format(str(e)))
+    pytestmark = pytest.mark.skip(f"Missing envkey: {str(e)}")
 
 
 @pytest.mark.flaky(reruns=5)

tests/storage/test_http_with_singlefile.py

@@ -65,7 +65,7 @@ def callback(url, headers, **kwargs):
             """
             assert headers["User-Agent"].startswith("vdirsyncer/")
 
-            with open(self.tmpfile, "r") as f:
+            with open(self.tmpfile) as f:
                 body = f.read()
 
             return CallbackResult(

tests/system/cli/test_repair.py

@@ -39,7 +39,7 @@ def test_basic(storage, runner, collection):
     assert not result.exception
     assert "No UID" in result.output
     assert "'toobroken.txt' is malformed beyond repair" in result.output
-    (new_fname,) = [x for x in storage.listdir() if "toobroken" not in str(x)]
+    (new_fname,) = (x for x in storage.listdir() if "toobroken" not in str(x))
     assert "UID:" in new_fname.read()
 
 

tests/unit/sync/test_sync.py

@@ -561,7 +561,7 @@ async def get(href):
             _old_update = s.update
 
             async def upload(item):
-                return ((await _old_upload(item)))[0], "NULL"
+                return (await _old_upload(item))[0], "NULL"
 
             async def update(href, item, etag):
                 return await _old_update(href, item, etag) and "NULL"

vdirsyncer/cli/config.py

@@ -88,9 +88,7 @@ def _validate_collections_param(collections):
                 raise ValueError("Duplicate value.")
             collection_names.add(collection_name)
         except ValueError as e:
-            raise ValueError(
-                "`collections` parameter, position {i}: {e}".format(i=i, e=str(e))
-            )
+            raise ValueError(f"`collections` parameter, position {i}: {str(e)}")
 
 
 class _ConfigReader:
@@ -135,7 +133,7 @@ def parse(self):
                     dict(_parse_options(self._parser.items(section), section=section)),
                 )
             except ValueError as e:
-                raise exceptions.UserError('Section "{}": {}'.format(section, str(e)))
+                raise exceptions.UserError(f'Section "{section}": {str(e)}')
 
         _validate_general_section(self._general)
         if getattr(self._file, "name", None):
@@ -152,7 +150,7 @@ def _parse_options(items, section=None):
         try:
             yield key, json.loads(value)
         except ValueError as e:
-            raise ValueError('Section "{}", option "{}": {}'.format(section, key, e))
+            raise ValueError(f'Section "{section}", option "{key}": {e}')
 
 
 class Config:
@@ -190,9 +188,7 @@ def from_filename_or_environment(cls, fname=None):
             with open(fname) as f:
                 return cls.from_fileobject(f)
         except Exception as e:
-            raise exceptions.UserError(
-                "Error during reading config {}: {}".format(fname, e)
-            )
+            raise exceptions.UserError(f"Error during reading config {fname}: {e}")
 
     def get_storage_args(self, storage_name):
         try:

vdirsyncer/cli/discover.py

@@ -74,7 +74,7 @@ async def collections_for_pair(
                 " before synchronization.".format(pair.name)
             )
 
-    logger.info("Discovering collections for pair {}".format(pair.name))
+    logger.info(f"Discovering collections for pair {pair.name}")
 
     a_discovered = _DiscoverResult(pair.config_a, connector=connector)
     b_discovered = _DiscoverResult(pair.config_b, connector=connector)

vdirsyncer/cli/fetchparams.py

@@ -30,9 +30,7 @@ def expand_fetch_params(config):
 @synchronized()
 def _fetch_value(opts, key):
     if not isinstance(opts, list):
-        raise ValueError(
-            "Invalid value for {}: Expected a list, found {!r}.".format(key, opts)
-        )
+        raise ValueError(f"Invalid value for {key}: Expected a list, found {opts!r}.")
     if not opts:
         raise ValueError("Expected list of length > 0.")
 
@@ -58,7 +56,7 @@ def _fetch_value(opts, key):
     except KeyError:
         raise exceptions.UserError(f"Unknown strategy: {strategy}")
 
-    logger.debug("Fetching value for {} with {} strategy.".format(key, strategy))
+    logger.debug(f"Fetching value for {key} with {strategy} strategy.")
     try:
         rv = strategy_fn(*opts[1:])
     except (click.Abort, KeyboardInterrupt) as e:

vdirsyncer/cli/tasks.py

@@ -93,9 +93,7 @@ async def discover_collections(pair, **kwargs):
     collections = [c for c, (a, b) in rv]
     if collections == [None]:
         collections = None
-    cli_logger.info(
-        "Saved for {}: collections = {}".format(pair.name, json.dumps(collections))
-    )
+    cli_logger.info(f"Saved for {pair.name}: collections = {json.dumps(collections)}")
 
 
 async def repair_collection(