rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shlex: Remove lineno/commenters

Browse Source
This commit is contained in:
Florian Bruhin 2014-11-03 21:37:36 +01:00
parent 861705f655
commit b8d9f3b041
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qutebrowser/utils/split.py
View File

@ -37,7 +37,6 @@ class ShellLexer:
self.instream = sys.stdin self.instream = sys.stdin
self.infile = None self.infile = None
self.eof = None self.eof = None
self.commenters = '#'
self.wordchars = ('abcdfeghijklmnopqrstuvwxyz' self.wordchars = ('abcdfeghijklmnopqrstuvwxyz'
'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_') 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_')
self.wordchars += ('ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ' self.wordchars += ('ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ'
@ -49,12 +48,10 @@ class ShellLexer:
self.escapedquotes = '"' self.escapedquotes = '"'
self.state = ' ' self.state = ' '
self.pushback = deque() self.pushback = deque()
self.lineno = 1
self.debug = 0 self.debug = 0
self.token = '' self.token = ''
if self.debug: if self.debug:
print('shlex: reading from %s, line %d' \ print('shlex: reading from %s' % (self.instream))
% (self.instream, self.lineno))
def get_token(self): def get_token(self):
"Get a token from the input stream (or from stack if it's nonempty)" "Get a token from the input stream (or from stack if it's nonempty)"
@ -81,8 +78,6 @@ class ShellLexer:
escapedstate = ' ' escapedstate = ' '
while True: while True:
nextchar = self.instream.read(1) nextchar = self.instream.read(1)
if nextchar == '\n':
self.lineno = self.lineno + 1
if self.debug >= 3: if self.debug >= 3:
print("shlex: in state", repr(self.state), \ print("shlex: in state", repr(self.state), \
"I see character:", repr(nextchar)) "I see character:", repr(nextchar))
@ -100,9 +95,6 @@ class ShellLexer:
break # emit current token break # emit current token
else: else:
continue continue
elif nextchar in self.commenters:
self.instream.readline()
self.lineno = self.lineno + 1
elif nextchar in self.escape: elif nextchar in self.escape:
escapedstate = 'a' escapedstate = 'a'
self.state = nextchar self.state = nextchar
@ -160,14 +152,6 @@ class ShellLexer:
break # emit current token break # emit current token
else: else:
continue continue
elif nextchar in self.commenters:
self.instream.readline()
self.lineno = self.lineno + 1
self.state = ' '
if self.token or quoted:
break # emit current token
else:
continue
elif nextchar in self.quotes: elif nextchar in self.quotes:
self.state = nextchar self.state = nextchar
elif nextchar in self.escape: elif nextchar in self.escape:
@ -212,7 +196,6 @@ def _get_lexer(s):
raise TypeError("Refusing to create a lexer with s=None!") raise TypeError("Refusing to create a lexer with s=None!")
lexer = ShellLexer(s) lexer = ShellLexer(s)
lexer.whitespace_split = True lexer.whitespace_split = True
lexer.commenters = ''
return lexer return lexer