From: ng0 <ng0@n0.is>
Date: Mon, 5 Mar 2018 08:10:43 +0000 (+0000)
Subject: flake8 fixes for pydiffer
X-Git-Tag: v0.11.0pre66~183
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2046013659e9b495e8561a4cb56bc4e0de0287ac;p=oweals%2Fgnunet.git

flake8 fixes for pydiffer
---

diff --git a/contrib/pydiffer.py.in b/contrib/pydiffer.py.in
index 23d546b25..10145371c 100644
--- a/contrib/pydiffer.py.in
+++ b/contrib/pydiffer.py.in
@@ -4,36 +4,41 @@ import sys
 import difflib
 import filecmp
 
-def getdiff (old, new):
-  diff = []
-  with open (old) as a:
-    with open (new) as b:
-      for l in difflib.unified_diff (a.read ().splitlines (), b.read ().splitlines ()):
-        diff.append (l)
-  return diff
-
-def dc_getdiff (dc, old, new):
-  diff = []
-  for f in dc.left_only:
-    diff.append ("Only in {}: {}".format (old, f))
-  for f in dc.right_only:
-    diff.append ("Only in {}: {}".format (new, f))
-  for f in dc.diff_files:
-    r = getdiff (os.path.join (old, f), os.path.join (new, f))
-    diff.extend (r)
-  for dn, dc in dc.subdirs.items ():
-    r = dc_getdiff (dc, os.path.join (old, dn), os.path.join (new, dn))
-    diff.extend (r)
-  return diff
-
-def dcdiff (old, new):
-  dc = filecmp.dircmp (old, new)
-  diff = dc_getdiff (dc, old, new)
-  return diff
-
-def main ():
-  for l in dcdiff (sys.argv[1], sys.argv[2]):
-    print (l)
+
+def getdiff(old, new):
+    diff = []
+    with open(old) as a:
+        with open(new) as b:
+            for l in difflib.unified_diff(a.read().splitlines(), b.read().splitlines()):
+                diff.append(l)
+    return diff
+
+
+def dc_getdiff(dc, old, new):
+    diff = []
+    for f in dc.left_only:
+        diff.append("Only in {}: {}".format(old, f))
+    for f in dc.right_only:
+        diff.append("Only in {}: {}".format(new, f))
+    for f in dc.diff_files:
+        r = getdiff(os.path.join(old, f), os.path.join(new, f))
+        diff.extend(r)
+    for dn, dc in dc.subdirs.items():
+        r = dc_getdiff(dc, os.path.join(old, dn), os.path.join(new, dn))
+        diff.extend(r)
+    return diff
+
+
+def dcdiff(old, new):
+    dc = filecmp.dircmp(old, new)
+    diff = dc_getdiff(dc, old, new)
+    return diff
+
+
+def main():
+    for l in dcdiff(sys.argv[1], sys.argv[2]):
+        print(l)
+
 
 if __name__ == '__main__':
-  main ()
+    main()