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

some more minor fixes

Browse source
This commit is contained in:
Anthony Scopatz 2016-06-16 21:41:46 -04:00
parent 1fc3a2efa2
commit 9796518163
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xonsh/ast.py
View file

@ -13,7 +13,7 @@ from ast import Module, Num, Expr, Str, Bytes, UnaryOp, UAdd, USub, Invert, \
Attribute, Global, Nonlocal, If, While, For, withitem, With, Try, \
ExceptHandler, FunctionDef, ClassDef, Starred, NodeTransformer, \
Interactive, Expression, Index, literal_eval, dump, walk, increment_lineno
from ast import Ellipsis # pylint: disable=redefined-builtin
from ast import Ellipsis as EllipsisNode
# pylint: enable=unused-import
import textwrap
import itertools

3
xonsh/parsers/base.py
View file

@ -255,6 +255,7 @@ class BaseParser(object):
yacc_kwargs['outputdir'] = outputdir
self.parser = None
YaccLoader(self, yacc_kwargs)
#self.parser = yacc.yacc(**yacc_kwargs)
# Keeps track of the last token given to yacc (the lookahead token)
self._last_yielded_token = None
@ -1710,7 +1711,7 @@ class BaseParser(object):
def p_atom_ellip(self, p):
"""atom : ellipsis_tok"""
p1 = p[1]
p[0] = ast.Ellipsis(lineno=p1.lineno, col_offset=p1.lexpos)
p[0] = ast.EllipsisNode(lineno=p1.lineno, col_offset=p1.lexpos)
def p_atom_none(self, p):
"""atom : none_tok"""