mirror of
https://github.com/davidhalter/jedi.git
synced 2025-12-11 08:11:50 +08:00
deleted old crap code
This commit is contained in:
@@ -21,7 +21,7 @@ import re
|
|||||||
import tokenize
|
import tokenize
|
||||||
|
|
||||||
from _compatibility import next, literal_eval, cleandoc, Python3Method, \
|
from _compatibility import next, literal_eval, cleandoc, Python3Method, \
|
||||||
property, unicode
|
property, unicode, is_py3k
|
||||||
import common
|
import common
|
||||||
import debug
|
import debug
|
||||||
|
|
||||||
@@ -910,48 +910,14 @@ class Statement(Simple):
|
|||||||
|
|
||||||
middle, tok = parse_stmt_or_arr(token_iterator, added_breaks=['in'])
|
middle, tok = parse_stmt_or_arr(token_iterator, added_breaks=['in'])
|
||||||
if tok != 'in' or middle is None:
|
if tok != 'in' or middle is None:
|
||||||
#if middle is None:
|
debug.warning('list comprehension middle @%s' % str(start_pos))
|
||||||
# level -= 1
|
|
||||||
#else:
|
|
||||||
#middle.parent = self.scope
|
|
||||||
debug.warning('list comprehension formatting @%s' %
|
|
||||||
start_pos[0])
|
|
||||||
return None, tok
|
return None, tok
|
||||||
|
|
||||||
in_clause, tok = parse_stmt_or_arr(token_iterator)
|
in_clause, tok = parse_stmt_or_arr(token_iterator)
|
||||||
"""
|
|
||||||
if tok not in b or in_clause is None:
|
|
||||||
#middle.parent = self.scope
|
|
||||||
if in_clause is None:
|
if in_clause is None:
|
||||||
self._gen.push_last_back()
|
debug.warning('list comprehension in @%s' % str(start_pos))
|
||||||
#else:
|
|
||||||
# in_clause.parent = self.scope
|
|
||||||
# in_clause.parent = self.scope
|
|
||||||
debug.warning('list comprehension in_clause %s@%s'
|
|
||||||
% (repr(tok), start_pos[0]))
|
|
||||||
return None, tok
|
return None, tok
|
||||||
"""
|
|
||||||
"""
|
|
||||||
other_level = 0
|
|
||||||
|
|
||||||
for i, tok in enumerate(reversed(token_list)):
|
|
||||||
if not isinstance(tok, (Name, ListComprehension)):
|
|
||||||
tok = tok[1]
|
|
||||||
if tok in closing_brackets:
|
|
||||||
other_level -= 1
|
|
||||||
elif tok in brackets.keys():
|
|
||||||
other_level += 1
|
|
||||||
if other_level > 0:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
# could not detect brackets -> nested list comp
|
|
||||||
i = 0
|
|
||||||
"""
|
|
||||||
#token_list, toks = token_list[:-i], token_list[-i:-1]
|
|
||||||
|
|
||||||
|
|
||||||
if middle is None or in_clause is None:
|
|
||||||
return None, tok
|
|
||||||
return ListComprehension(st, middle, in_clause, self), tok
|
return ListComprehension(st, middle, in_clause, self), tok
|
||||||
|
|
||||||
# initializations
|
# initializations
|
||||||
@@ -1135,6 +1101,11 @@ class Call(Simple):
|
|||||||
def get_code(self):
|
def get_code(self):
|
||||||
if self.type == Call.NAME:
|
if self.type == Call.NAME:
|
||||||
s = self.name.get_code()
|
s = self.name.get_code()
|
||||||
|
else:
|
||||||
|
if isinstance(self.name, str) and "'" not in self.name:
|
||||||
|
# This is a very rough spot, because of repr not supporting
|
||||||
|
# unicode signs, see `test_unicode_script`.
|
||||||
|
s = "'%s'" % unicode(self.name, 'UTF-8')
|
||||||
else:
|
else:
|
||||||
s = '' if self.name is None else repr(self.name)
|
s = '' if self.name is None else repr(self.name)
|
||||||
if self.execution is not None:
|
if self.execution is not None:
|
||||||
|
|||||||
@@ -240,7 +240,8 @@ class TestRegression(TestBase):
|
|||||||
|
|
||||||
s = utf8("author='öä'; author")
|
s = utf8("author='öä'; author")
|
||||||
completions = self.complete(s)
|
completions = self.complete(s)
|
||||||
assert type(completions[0].description) is unicode
|
x = completions[0].description
|
||||||
|
assert type(x) is unicode
|
||||||
|
|
||||||
s = utf8("#-*- coding: iso-8859-1 -*-\nauthor='öä'; author")
|
s = utf8("#-*- coding: iso-8859-1 -*-\nauthor='öä'; author")
|
||||||
s = s.encode('latin-1')
|
s = s.encode('latin-1')
|
||||||
|
|||||||
Reference in New Issue
Block a user