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: 9dd7ea0bcd9a
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: b27682ad2069
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 23, 2016

  1. browser: cleanup

    jordens committed May 23, 2016
    Copy the full SHA
    b8e7ea8 View commit details
  2. Copy the full SHA
    b27682a View commit details
Showing with 5 additions and 2 deletions.
  1. +4 −1 artiq/browser/experiments.py
  2. +1 −1 artiq/frontend/artiq_browser.py
5 changes: 4 additions & 1 deletion artiq/browser/experiments.py
Original file line number Diff line number Diff line change
@@ -229,9 +229,12 @@ def dropEvent(self, ev):
asyncio.ensure_future(self._load_hdf5_task(uri.path()))
break

async def compute_arginfo(self):
return await self._area.compute_arginfo(self.expurl)

async def _recompute_arguments(self, overrides={}):
try:
arginfo = await self._area.compute_arginfo(self.expurl)
arginfo = await self.compute_arginfo()
except:
logger.error("Could not recompute arguments of '%s'",
self.expurl, exc_info=True)
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_browser.py
Original file line number Diff line number Diff line change
@@ -147,7 +147,7 @@ def __init__(self, log, *args, **kwargs):
self.setFormatter(logging.Formatter("%(name)s:%(message)s"))

def emit(self, record):
if getattr(self.log, "model") is not None:
if self.log.model is not None:
self.log.model.append((record.levelno, record.source,
record.created, self.format(record)))