Skip to content

Commit 050ddca

Browse files
committed
Merge pull request #5 from MeGaPk/master
Small fixes + implementation
2 parents c383d4f + 2bf1f32 commit 050ddca

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

python/makerbotapi/makerbotapi.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ def __init__(self):
314314
self.cancelled = None
315315
self.id = None
316316
self.methods = []
317+
self.progress = None
317318

318319

319320
class Makerbot(object):
@@ -427,7 +428,7 @@ def _wait_for_rpc_response(self, requestid, timeout=3):
427428
too_late = time.time() + timeout
428429
while time.time() < too_late:
429430
if requestid in self.rpc_id_responses:
430-
return self.rpc_id_responses[requestid]
431+
return self.rpc_id_responses.pop(requestid)
431432
return None
432433

433434
def _rpc_reader_thread(self):
@@ -628,7 +629,8 @@ def get_system_information(self):
628629
'cancelled',
629630
'reason',
630631
'id',
631-
'methods']:
632+
'methods',
633+
'progress']:
632634
if attr in json_current_process:
633635
setattr(
634636
current_bot_process, attr, json_current_process[attr])

0 commit comments

Comments
 (0)