From adc08785b64159b7046af6e039625ce7ca6a8341 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Sat, 4 Feb 2017 11:33:36 +0000 Subject: [PATCH 1/3] Build universal wheels This tells wheel that the packages are compatible with Python 2 and 3. The wheel currently on PyPI is only tagged 'py2', so installing on Python 3 uses the sdist. --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..3c6e79cf --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 From 68c6f8dd0329fce5682bb0d3a5e3e8bf6453ef9d Mon Sep 17 00:00:00 2001 From: "Daniel M. Capella" Date: Mon, 13 Feb 2017 15:00:02 -0500 Subject: [PATCH 2/3] readme: Add maralla/completor.vim https://github.com/maralla/completor.vim --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1adf138f..2f25c014 100644 --- a/README.rst +++ b/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 From fc27ca1b6ada9ac9f70fd38a4f7f803b40d1572e Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Thu, 23 Feb 2017 15:29:23 -0800 Subject: [PATCH 3/3] 'fix a couple of error locations' --- jedi/evaluate/compiled/__init__.py | 2 +- jedi/evaluate/compiled/fake.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate/compiled/__init__.py b/jedi/evaluate/compiled/__init__.py index 131c9598..b524fe10 100644 --- a/jedi/evaluate/compiled/__init__.py +++ b/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 diff --git a/jedi/evaluate/compiled/fake.py b/jedi/evaluate/compiled/fake.py index 47332703..607c0053 100644 --- a/jedi/evaluate/compiled/fake.py +++ b/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)