mirror of
https://github.com/davidhalter/jedi.git
synced 2025-12-08 06:44:46 +08:00
merge and a few changes for the SyntaxError problem with mixin in (pip installation). -> fixes #79, also important for #82, #81, davidhalter/jedi-vim/issues/41, solution from #65
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
include README.rst
|
include README.rst
|
||||||
include LICENSE.txt
|
include LICENSE.txt
|
||||||
include AUTHORS.txt
|
include AUTHORS.txt
|
||||||
include jedi/mixin/*.py
|
include jedi/mixin/*.pym
|
||||||
recursive-exclude * *.pyc
|
recursive-exclude * *.pyc
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ class Parser(CachedModule):
|
|||||||
if name == '__builtin__' and not is_py3k:
|
if name == '__builtin__' and not is_py3k:
|
||||||
name = 'builtins'
|
name = 'builtins'
|
||||||
path = os.path.dirname(os.path.abspath(__file__))
|
path = os.path.dirname(os.path.abspath(__file__))
|
||||||
with open(os.path.sep.join([path, 'mixin', name]) + '.py') as f:
|
with open(os.path.sep.join([path, 'mixin', name]) + '.pym') as f:
|
||||||
s = f.read()
|
s = f.read()
|
||||||
except IOError:
|
except IOError:
|
||||||
return {}
|
return {}
|
||||||
|
|||||||
2
setup.py
2
setup.py
@@ -20,7 +20,7 @@ setup(name='jedi',
|
|||||||
keywords='python completion refactoring vim',
|
keywords='python completion refactoring vim',
|
||||||
long_description=readme,
|
long_description=readme,
|
||||||
packages=['jedi'],
|
packages=['jedi'],
|
||||||
data_files={'jedi': ['mixin/*.py']},
|
package_data={'jedi': ['mixin/*.pym']},
|
||||||
platforms=['any'],
|
platforms=['any'],
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Development Status :: 4 - Beta',
|
'Development Status :: 4 - Beta',
|
||||||
|
|||||||
Reference in New Issue
Block a user