Merge remote-tracking branch 'origin/master' into dev

README.rst

@@ -32,7 +32,7 @@ It's really easy.
 
 Jedi can currently be used with the following editors/projects:
 
-- Vim (jedi-vim_, YouCompleteMe_, deoplete-jedi_)
+- Vim (jedi-vim_, YouCompleteMe_, deoplete-jedi_, completor.vim_)
 - Emacs (Jedi.el_, company-mode_, elpy_, anaconda-mode_, ycmd_)
 - Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3])
 - TextMate_ (Not sure if it's actually working)
@@ -191,6 +191,7 @@ Acknowledgements
 .. _jedi-vim: https://github.com/davidhalter/jedi-vim
 .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
 .. _deoplete-jedi: https://github.com/zchee/deoplete-jedi
+.. _completor.vim: https://github.com/maralla/completor.vim
 .. _Jedi.el: https://github.com/tkf/emacs-jedi
 .. _company-mode: https://github.com/syohex/emacs-company-jedi
 .. _elpy: https://github.com/jorgenschaefer/elpy

jedi/evaluate/compiled/__init__.py

@@ -346,7 +346,7 @@ class CompiledObjectFilter(AbstractFilter):
 
         is_instance = self._is_instance or fake.is_class_instance(obj)
         # ``dir`` doesn't include the type names.
-        if not inspect.ismodule(obj) and obj != type and not is_instance:
+        if not inspect.ismodule(obj) and (obj is not type) and not is_instance:
             for filter in create(self._evaluator, type).get_filters():
                 names += filter.values()
         return names

jedi/evaluate/compiled/fake.py

@@ -132,7 +132,7 @@ def _faked(module, obj, name):
                     return None, None
                 return _search_scope(cls, obj.__name__), faked_mod
     else:
-        if obj == module:
+        if obj is module:
             return _search_scope(faked_mod, name), faked_mod
         else:
             try:
@@ -156,7 +156,7 @@ def memoize_faked(obj):
         key = (obj, args, frozenset(kwargs.items()))
         try:
             result = cache[key]
-        except TypeError:
+        except (TypeError, ValueError):
             return obj(*args, **kwargs)
         except KeyError:
             result = obj(*args, **kwargs)

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1