From 0825b2b53406bb4acf9d3857a1f846efa845877e Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Mon, 13 Jul 2020 17:17:20 +0200
Subject: [refactoring] fix or ignore many pylint hints

* Add missing docstrings
* Remove unused imports
* fix line-to-long
* fix some typos
* ignore global-statement
* ignore wrong-import-order for scripts under /scripts
---
 merge.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'merge.py')

diff --git a/merge.py b/merge.py
index 185183f..51dd774 100755
--- a/merge.py
+++ b/merge.py
@@ -28,11 +28,16 @@ from allocbench.util import print_license_and_exit
 
 
 def load_file(filename):
+    """Load a json file"""
     with open(filename, "r") as json_file:
         return json.load(json_file)
 
 
 def main():
+    """Merge the two allocbench benchmark results
+
+    For each benchmark result included in both result directories all
+    missing allocators in the first results are copied from the second."""
     if "--license" in sys.argv:
         print_license_and_exit()
 
-- 
cgit v1.2.3