summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCeridwen <ceridwenv@gmail.com>2015-09-13 20:21:20 -0400
committerCeridwen <ceridwenv@gmail.com>2015-09-13 20:21:20 -0400
commit9a32f50ca14360d63e5b5f146b288834a10b5e09 (patch)
tree8c413848b7e2655aa6b71b1bba49ffe91b5d5e83
parente7fe58a7137123080aa4431abf7a52b5e25142c2 (diff)
downloadastroid-git-9a32f50ca14360d63e5b5f146b288834a10b5e09.tar.gz
Fix indentation changed in merge, again
-rw-r--r--astroid/bases.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/astroid/bases.py b/astroid/bases.py
index 0bd2a4ec..ac5d6359 100644
--- a/astroid/bases.py
+++ b/astroid/bases.py
@@ -299,7 +299,7 @@ class UnboundMethod(Proxy):
# If we're unbound method __new__ of builtin object, the result is an
# instance of the class given as first argument.
if (self._proxied.name == '__new__' and
- self._proxied.parent.frame().qname() == '%s.object' % BUILTINS):
+ self._proxied.parent.frame().qname() == '%s.object' % BUILTINS):
infer = caller.args[0].infer() if caller.args else []
return ((x is util.YES and x or Instance(x)) for x in infer)
return self._proxied.infer_call_result(caller, context)