Merge with the linter branch (especially the changes of pep484.

2016-06-07 13:51:25 +02:00
parent ed152e440e 9c0f3f9535
commit 82c76fa689
27 changed files with 883 additions and 108 deletions
--- a/jedi/parser/init.py
+++ b/jedi/parser/init.py
@@ -46,7 +46,7 @@ def load_grammar(version='3.4'):
    if version in ('3.2', '3.3'):
        version = '3.4'
    elif version == '2.6':
-        version == '2.7'
+        version = '2.7'

    file = 'grammar' + version + '.txt'