Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'aureplop/py34-compat' into 'master'

Browse source 
py34 compat

See merge request !279
This commit is contained in:
Aurélien Delobelle 2018-01-10 17:30:44 +01:00
commit 44eee9be38
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kfet/open/open.py
View file

@ -85,7 +85,7 @@ class OpenKfet(CachedMixin, object):
'admin_status': self.admin_status(status), 'admin_status': self.admin_status(status),
'force_close': self.force_close, 'force_close': self.force_close,
} }
return base, {**base, **restrict} return base, dict(base, **restrict)
def export(self, user): def export(self, user):
"""Export internal state for a given user. """Export internal state for a given user.