pylint: upgrade to 1.4.1

third_party/pylint/checkers/typecheck.py

 # Copyright (c) 2006-2013 LOGILAB S.A. (Paris, FRANCE).
 # http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ skipping 326 matching lines @@
             attrs = klass._proxied.getattr(node.func.attrname)
         except astroid.NotFoundError:
             return
 
         for attr in attrs:
             if attr is astroid.YES:
                 continue
             if not isinstance(attr, astroid.Function):
                 continue
 
-            # Decorated, see if it is decorated with a property
+            # Decorated, see if it is decorated with a property.
+            # Also, check the returns and see if they are callable.
             if decorated_with_property(attr):
-                self.add_message('not-callable', node=node,
-                                 args=node.func.as_string())
-                break
+                if all(return_node.callable()
+                       for return_node in attr.infer_call_result(node)):
+                    continue
+                else:
+                    self.add_message('not-callable', node=node,
+                                     args=node.func.as_string())
+                    break
 
     @check_messages(*(list(MSGS.keys())))
     def visit_callfunc(self, node):
         """check that called functions/methods are inferred to callable objects,
         and that the arguments passed to the function match the parameters in
         the inferred function's definition
         """
         # Build the set of keyword arguments, checking for duplicate keywords,
         # and count the positional arguments.
         keyword_args = set()
@@ skipping 251 matching lines @@
                     return
                 except astroid.NotFoundError:
                     pass
 
             # Anything else is an error
             self.add_message('invalid-slice-index', node=node)
 
 def register(linter):
     """required method to auto register this checker """
     linter.register_checker(TypeChecker(linter))