Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db05ec0277f5
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8fb6d4cdb43d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 28, 2015

  1. test.coredevice.portability.HostVsDeviceCase.test_exceptions: update. 

    TypeError would never be raised with the new compiler.
It crashes in a different way now.
    whitequark committed Dec 28, 2015
    Copy the full SHA
    0dd7194 View commit details

  2. coredevice.comm_generic: handle RPC default args correctly.

    whitequark committed Dec 28, 2015
    Copy the full SHA
    8fb6d4c View commit details
Showing with 4 additions and 2 deletions.
  1. +3 −1 artiq/coredevice/comm_generic.py
  2. +1 −1 artiq/test/coredevice/portability.py
4 changes: 3 additions & 1 deletion artiq/coredevice/comm_generic.py
View file
Original file line number Diff line number Diff line change
@@ -341,12 +341,14 @@ def _receive_rpc_value(self, object_map):

def _receive_rpc_args(self, object_map, defaults):
args = []
default_arg_num = 0
while True:
value = self._receive_rpc_value(object_map)
if value is self._rpc_sentinel:
return args
elif value is self._rpc_undefined:
args.append(defaults[len(args)])
args.append(defaults[default_arg_num])
default_arg_num += 1
else:
args.append(value)

2 changes: 1 addition & 1 deletion artiq/test/coredevice/portability.py
View file
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ def run(self):
raise _MyException
elif i == 2:
raise IndexError
except (TypeError, IndexError):
except IndexError:
self.trace.append(101)
raise
except: