mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-05 17:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'adqm-351'

Browse source
This commit is contained in:
Anthony Scopatz 2015-12-11 18:33:04 -05:00
commit 795929ff0b
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xonsh/parser.py
View file

@ -8,8 +8,9 @@ from ply import yacc
from xonsh import ast
from xonsh.lexer import Lexer
from xonsh.tools import VER_3_4, VER_3_5, VER_MAJOR_MINOR, V_MAJOR_MINOR, \
docstring_by_version
from xonsh.tools import (VER_3_4, VER_3_5, VER_3_5_1,
VER_MAJOR_MINOR, VER_FULL,
docstring_by_version)
class Location(object):
@ -582,7 +583,14 @@ class Parser(object):
def p_tfpdef(self, p):
"""tfpdef : NAME colon_test_opt"""
p[0] = ast.arg(arg=p[1], annotation=p[2])
kwargs = {'arg': p[1],
'annotation': p[2]}
if VER_FULL >= VER_3_5_1:
kwargs.update({
'lineno': self.lineno,
'col_offset': self.col,
})
p[0] = ast.arg(**kwargs)
def p_comma_tfpdef(self, p):
"""comma_tfpdef : COMMA
@ -701,7 +709,14 @@ class Parser(object):
def p_vfpdef(self, p):
"""vfpdef : NAME"""
p[0] = ast.arg(arg=p[1], annotation=None)
kwargs = {'arg': p[1],
'annotation': None}
if VER_FULL >= VER_3_5_1:
kwargs.update({
'lineno': self.lineno,
'col_offset': self.col,
})
p[0] = ast.arg(**kwargs)
def p_comma_vfpdef(self, p):
"""comma_vfpdef : COMMA

2
xonsh/tools.py
View file

@ -48,6 +48,8 @@ IS_ROOT = ctypes.windll.shell32.IsUserAnAdmin() != 0 if ON_WINDOWS else os.getui
VER_3_4 = (3, 4)
VER_3_5 = (3, 5)
VER_3_5_1 = (3, 5, 1)
VER_FULL = sys.version_info[:3]
VER_MAJOR_MINOR = sys.version_info[:2]
V_MAJOR_MINOR = 'v{0}{1}'.format(*sys.version_info[:2])