From f1b45bed96127777aecbf3adccedc7fd77a2e51d Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Mon, 24 Sep 2018 22:22:50 +0200
Subject: [PATCH] Fix some property issues

---
 jedi/plugins/stdlib.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py
index a9643071..16eba511 100644
--- a/jedi/plugins/stdlib.py
+++ b/jedi/plugins/stdlib.py
@@ -65,12 +65,17 @@ class StdlibPlugin(BasePlugin):
                     module_name = ''
 
                 if isinstance(context, BoundMethod):
-                    if module_name == 'builtins' and context.py__name__() == '__get__':
-                        if context.class_context.py__name__() == 'property':
-                            return builtins_property(
-                                context,
-                                arguments=arguments
-                            )
+                    if module_name == 'builtins':
+                        if context.py__name__() == '__get__':
+                            if context.class_context.py__name__() == 'property':
+                                return builtins_property(
+                                    context,
+                                    arguments=arguments
+                                )
+                        elif context.py__name__() in ('deleter', 'getter', 'setter'):
+                            if context.class_context.py__name__() == 'property':
+                                return ContextSet([context.instance])
+
                     return callback(context, arguments=arguments)
 
                 # for now we just support builtin functions.