From 65febf2b11ff15b373ebb8bfb7b22815703c7546 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Thu, 23 Jun 2016 16:55:14 +0300
Subject: [PATCH] Ignore possible discrepancies between dir(x) and x.__dict__
 (PY-19349)

---
 python/helpers/pycharm_generator_utils/module_redeclarator.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/python/helpers/pycharm_generator_utils/module_redeclarator.py b/python/helpers/pycharm_generator_utils/module_redeclarator.py
index a79a91ed4dd3..fd34c3ad7c37 100644
--- a/python/helpers/pycharm_generator_utils/module_redeclarator.py
+++ b/python/helpers/pycharm_generator_utils/module_redeclarator.py
@@ -684,7 +684,9 @@ class ModuleRedeclarator(object):
                 try:
                     item = getattr(p_class, item_name) # let getters do the magic
                 except AttributeError:
-                    item = field_source[item_name] # have it raw
+                    item = field_source.get(item_name) # have it raw
+                    if item is None:
+                        continue
                 except Exception:
                     continue
             if is_callable(item) and not isinstance(item, type):