cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #12258: don't wrap None in UnsafeProxy.

Browse source
This commit is contained in:
Victor Costan 2015-09-05 17:30:43 -04:00 committed by James Cammarata
parent ac6f61ec7f
commit bd405169fb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/vars/__init__.py
View file

@ -183,7 +183,7 @@ class VariableManager:
try: try:
host_facts = self._fact_cache.get(host.name, dict()) host_facts = self._fact_cache.get(host.name, dict())
for k in host_facts.keys(): for k in host_facts.keys():
if not isinstance(host_facts[k], UnsafeProxy): if host_facts[k] is not None and not isinstance(host_facts[k], UnsafeProxy):
host_facts[k] = UnsafeProxy(host_facts[k]) host_facts[k] = UnsafeProxy(host_facts[k])
all_vars = combine_vars(all_vars, host_facts) all_vars = combine_vars(all_vars, host_facts)
except KeyError: except KeyError:

5
lib/ansible/vars/unsafe_proxy.py
View file

@ -72,6 +72,8 @@ class UnsafeProxy(object):
return bool(object.__getattribute__(self, "_obj")) return bool(object.__getattribute__(self, "_obj"))
def __str__(self): def __str__(self):
return str(object.__getattribute__(self, "_obj")) return str(object.__getattribute__(self, "_obj"))
def __unicode__(self):
return unicode(object.__getattribute__(self, "_obj"))
def __repr__(self): def __repr__(self):
return repr(object.__getattribute__(self, "_obj")) return repr(object.__getattribute__(self, "_obj"))
@ -89,7 +91,7 @@ class UnsafeProxy(object):
'__long__', '__lshift__', '__lt__', '__mod__', '__mul__', '__ne__', '__long__', '__lshift__', '__lt__', '__mod__', '__mul__', '__ne__',
'__neg__', '__oct__', '__or__', '__pos__', '__pow__', '__radd__', '__neg__', '__oct__', '__or__', '__pos__', '__pow__', '__radd__',
'__rand__', '__rdiv__', '__rdivmod__', '__reduce__', '__reduce_ex__', '__rand__', '__rdiv__', '__rdivmod__', '__reduce__', '__reduce_ex__',
'__repr__', '__reversed__', '__rfloorfiv__', '__rlshift__', '__rmod__', '__repr__', '__reversed__', '__rfloordiv__', '__rlshift__', '__rmod__',
'__rmul__', '__ror__', '__rpow__', '__rrshift__', '__rshift__', '__rsub__', '__rmul__', '__ror__', '__rpow__', '__rrshift__', '__rshift__', '__rsub__',
'__rtruediv__', '__rxor__', '__setitem__', '__setslice__', '__sub__', '__rtruediv__', '__rxor__', '__setitem__', '__setslice__', '__sub__',
'__truediv__', '__xor__', 'next', '__truediv__', '__xor__', 'next',
@ -127,6 +129,5 @@ class UnsafeProxy(object):
except KeyError: except KeyError:
cache[obj.__class__] = theclass = cls._create_class_proxy(obj.__class__) cache[obj.__class__] = theclass = cls._create_class_proxy(obj.__class__)
ins = object.__new__(theclass) ins = object.__new__(theclass)
theclass.__init__(ins, obj, *args, **kwargs)
return ins return ins