Show More
@@ -17,7 +17,7 b' import pushkey as pushkeymod' | |||||
17 | class future(object): |
|
17 | class future(object): | |
18 | '''placeholder for a value to be set later''' |
|
18 | '''placeholder for a value to be set later''' | |
19 | def set(self, value): |
|
19 | def set(self, value): | |
20 | if hasattr(self, 'value'): |
|
20 | if util.safehasattr(self, 'value'): | |
21 | raise error.RepoError("future is already set") |
|
21 | raise error.RepoError("future is already set") | |
22 | self.value = value |
|
22 | self.value = value | |
23 |
|
23 | |||
@@ -58,8 +58,9 b' class remotebatch(batcher):' | |||||
58 | req, rsp = [], [] |
|
58 | req, rsp = [], [] | |
59 | for name, args, opts, resref in self.calls: |
|
59 | for name, args, opts, resref in self.calls: | |
60 | mtd = getattr(self.remote, name) |
|
60 | mtd = getattr(self.remote, name) | |
61 |
|
|
61 | batchablefn = getattr(mtd, 'batchable', None) | |
62 | batchable = getattr(mtd, 'batchable')(mtd.im_self, *args, **opts) |
|
62 | if batchablefn is not None: | |
|
63 | batchable = batchablefn(mtd.im_self, *args, **opts) | |||
63 | encargsorres, encresref = batchable.next() |
|
64 | encargsorres, encresref = batchable.next() | |
64 | if encresref: |
|
65 | if encresref: | |
65 | req.append((name, encargsorres,)) |
|
66 | req.append((name, encargsorres,)) |
General Comments 0
You need to be logged in to leave comments.
Login now