diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2020-05-15 17:37:10 +0200 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2020-06-02 11:18:47 +0200 |
| commit | 6c50793f81ed8b6ef1eee43e06ddb325c4aa047a (patch) | |
| tree | a59ada7d42c3bee60914515388d791933bde4f1f /merge.py | |
| parent | c9c5e185b3c32d5298ebfbad4f51f20fe966f00c (diff) | |
| download | allocbench-6c50793f81ed8b6ef1eee43e06ddb325c4aa047a.tar.gz allocbench-6c50793f81ed8b6ef1eee43e06ddb325c4aa047a.zip | |
remove deprecated pickle code
Diffstat (limited to 'merge.py')
| -rwxr-xr-x | merge.py | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -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(): |
