forked from DGNum/gestioCOF
Merge branch 'aureplop/py34-compat' into 'master'
py34 compat See merge request !279
This commit is contained in:
commit
44eee9be38
1 changed files with 1 additions and 1 deletions
|
@ -85,7 +85,7 @@ class OpenKfet(CachedMixin, object):
|
|||
'admin_status': self.admin_status(status),
|
||||
'force_close': self.force_close,
|
||||
}
|
||||
return base, {**base, **restrict}
|
||||
return base, dict(base, **restrict)
|
||||
|
||||
def export(self, user):
|
||||
"""Export internal state for a given user.
|
||||
|
|
Loading…
Reference in a new issue