From 61edfc090e06a822b0e63a7a6d28580781ad3ce2 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <bernhard@intevation.de>
Date: Mon, 28 Jun 2021 16:01:21 +0200
Subject: [PATCH] Adjust codestyle

running flake8, black and reorder-python-imports.
---
 .../resolve_interactively.py                  | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/contrib/conflict_resolution/resolve_interactively.py b/contrib/conflict_resolution/resolve_interactively.py
index 7d0e1c3..bd5b645 100755
--- a/contrib/conflict_resolution/resolve_interactively.py
+++ b/contrib/conflict_resolution/resolve_interactively.py
@@ -16,16 +16,17 @@ SPDX-License-Identifier: BSD-3-Clause
 SPDX-FileCopyrightText: 2021 Intevation GmbH <https://intevation.de>
 Author: <bernhard.reiter@intevation.de>
 """
-from pathlib import Path
 import re
 import subprocess
 import sys
+from pathlib import Path
 
 KDIALOG = "/usr/bin/kdialog"
 
 SUMMARY_PATTERN = re.compile("^(SUMMARY:.*)$", re.MULTILINE)
 
-def get_summary(icalendar_text:str):
+
+def get_summary(icalendar_text: str):
     """Get the first SUMMARY: line from an iCalendar text.
 
     Do not care about the line being continued.
@@ -38,30 +39,38 @@ def main(ical1_filename, ical2_filename):
     ical1 = ical1_filename.read_text()
     ical2 = ical2_filename.read_text()
 
-    additional_args = ["--yes-label", "take first"] # return code == 0
-    additional_args += ["--no-label", "take second"] # return code == 1
-    additional_args += ["--cancel-label", "do not resolve"] # return code == 2
+    additional_args = ["--yes-label", "take first"]  # return code == 0
+    additional_args += ["--no-label", "take second"]  # return code == 1
+    additional_args += ["--cancel-label", "do not resolve"]  # return code == 2
 
-    r = subprocess.run(args = [
-        KDIALOG,
-        "--warningyesnocancel",
-        "There was a sync conflict, do you prefer the first entry: \n" +
-        get_summary(ical1) + "...\n(full contents: " + str(ical1_filename) +
-        " )\n\nor the second entry: \n" +
-        get_summary(ical2) + "...\n(full contents: " + str(ical2_filename) + 
-        " )?"
-    ] + additional_args)
+    r = subprocess.run(
+        args=[
+            KDIALOG,
+            "--warningyesnocancel",
+            "There was a sync conflict, do you prefer the first entry: \n"
+            + get_summary(ical1)
+            + "...\n(full contents: "
+            + str(ical1_filename)
+            + " )\n\nor the second entry: \n"
+            + get_summary(ical2)
+            + "...\n(full contents: "
+            + str(ical2_filename)
+            + " )?",
+        ]
+        + additional_args
+    )
 
     if r.returncode == 2:
         # cancel was pressed
-        return # shall lead to items not changed, because not copied
+        return  # shall lead to items not changed, because not copied
 
     if r.returncode == 0:
         # we want to take the first item, so overwrite the second
         ical2_filename.write_text(ical1)
-    else: # r.returncode == 1, we want the second item, so overwrite the first
+    else:  # r.returncode == 1, we want the second item, so overwrite the first
         ical1_filename.write_text(ical2)
 
+
 if len(sys.argv) != 3:
     sys.stdout.write(__doc__)
 else: