ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source
This commit is contained in:
Andrew Hamilton 2016-10-21 22:24:52 +02:00
parent 29edc33337
commit e39d99b2ac
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools.py
View file

@ -608,10 +608,9 @@ def status_to_str(status):
class Result: class Result:
def __init__(self, path, tool, is_stored_compressed=True): def __init__(self, path, tool):
self.path = path self.path = path
self.tool = tool self.tool = tool
self._open_func = gzip.open if is_stored_compressed else open
self.pickle_path = os.path.join(CACHE_PATH, path + "-" + tool.__name__) self.pickle_path = os.path.join(CACHE_PATH, path + "-" + tool.__name__)
self.scroll_position = (0, 0) self.scroll_position = (0, 0)
self.is_completed = False self.is_completed = False
@ -625,7 +624,7 @@ class Result:
if self.is_placeholder: if self.is_placeholder:
return unknown_label return unknown_label
try: try:
with self._open_func(self.pickle_path, "rb") as pickle_file: with gzip.open(self.pickle_path, "rb") as pickle_file:
return pickle.load(pickle_file) return pickle.load(pickle_file)
except FileNotFoundError: except FileNotFoundError:
return unknown_label return unknown_label
@ -633,7 +632,7 @@ class Result:
@result.setter @result.setter
def result(self, value): def result(self, value):
os.makedirs(os.path.dirname(self.pickle_path), exist_ok=True) os.makedirs(os.path.dirname(self.pickle_path), exist_ok=True)
dump_pickle_safe(value, self.pickle_path, open=self._open_func) dump_pickle_safe(value, self.pickle_path, open=gzip.open)
Result.result.fget.evict(self) Result.result.fget.evict(self)
def set_status(self, status): def set_status(self, status):