提交 4cc132ed authored 作者: Olivier Delalleau's avatar Olivier Delalleau

Turned errors into warnings for merge

上级 d25aaeca
...@@ -30,7 +30,9 @@ class OrderedUpdates(OrderedDict): ...@@ -30,7 +30,9 @@ class OrderedUpdates(OrderedDict):
len(key[0]) > 1 and len(key[0]) > 1 and
not isinstance(key[0], OrderedDict)): not isinstance(key[0], OrderedDict)):
# Warn when using as input a non-ordered dictionary. # Warn when using as input a non-ordered dictionary.
raise AssertionError('WILL BE TURNED INTO WARNING BEFORE MERGING 1') warnings.warn('Initializing an `OrderedUpdates` from a '
'non-ordered dictionary with 2+ elements could '
'make your code non-deterministic')
super(OrderedUpdates, self).__init__(*key, **kwargs) super(OrderedUpdates, self).__init__(*key, **kwargs)
for key in self: for key in self:
if not isinstance(key, SharedVariable): if not isinstance(key, SharedVariable):
...@@ -59,7 +61,10 @@ class OrderedUpdates(OrderedDict): ...@@ -59,7 +61,10 @@ class OrderedUpdates(OrderedDict):
if (isinstance(other, dict) and if (isinstance(other, dict) and
len(other) > 1 and len(other) > 1 and
not isinstance(other, OrderedDict)): not isinstance(other, OrderedDict)):
raise AssertionError('WILL BE TURNED INTO WARNING BEFORE MERGING 2') # Warn about non-determinism.
warnings.warn('Updating an `OrderedUpdates` with a '
'non-ordered dictionary with 2+ elements could '
'make your code non-deterministic')
for key, val in OrderedDict(other).iteritems(): for key, val in OrderedDict(other).iteritems():
if key in self: if key in self:
if self[key] == val: if self[key] == val:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论