Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add bump #35

Merged
merged 1 commit into from
Mar 24, 2018
Merged

add bump #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packtivity/asyncbackends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@ def __init__(self, jobproxy, spec, statedata, pardata, resultdata = None):
self.pardata = pardata

def details(self):
prox = None
try:
dumped_prox = json.dumps(self.jobproxy)
json.dumps(self.jobproxy)
prox = self.jobproxy
except TypeError:
dumped_prox = None
pass
return {
'resultdata': self.resultdata,
'jobproxy': dumped_prox,
'jobproxy': prox,
'spec': self.spec,
'statedata': self.statedata,
'pardata': self.pardata,
Expand All @@ -65,7 +67,7 @@ def proxyname(self):

@classmethod
def fromJSON(cls, data):
if not data['jobproxy']:
if not data['proxydetails']['jobproxy']:
raise RuntimeError('not external backend proxy saved during serialization')
return cls(**data['proxydetails'])

Expand Down