From 6c50793f81ed8b6ef1eee43e06ddb325c4aa047a Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Fri, 15 May 2020 17:37:10 +0200
Subject: remove deprecated pickle code

---
 merge.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'merge.py')

diff --git a/merge.py b/merge.py
index ca20092..185183f 100755
--- a/merge.py
+++ b/merge.py
@@ -21,7 +21,6 @@
 import argparse
 import json
 import os
-import pickle
 import sys
 
 import allocbench.facter as facter
@@ -29,12 +28,8 @@ from allocbench.util import print_license_and_exit
 
 
 def load_file(filename):
-    if filename.endswith("json"):
-        with open(filename, "r") as json_file:
-            return json.load(json_file)
-    else:
-        with open(filename, "rb") as pickle_file:
-            return pickle.load(pickle_file)
+    with open(filename, "r") as json_file:
+        return json.load(json_file)
 
 
 def main():
-- 
cgit v1.2.3