forked from VimPlug/jedi
Merge branch 'dev' of github.com:davidhalter/jedi into dev
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -10,3 +10,4 @@
|
|||||||
/docs/_build/
|
/docs/_build/
|
||||||
/dist/
|
/dist/
|
||||||
jedi.egg-info/
|
jedi.egg-info/
|
||||||
|
record.json
|
||||||
|
|||||||
16
sith.py
16
sith.py
@@ -61,6 +61,9 @@ class SourceFinder(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def fetch(file_path):
|
def fetch(file_path):
|
||||||
|
if not os.path.isdir(file_path):
|
||||||
|
yield file_path
|
||||||
|
return
|
||||||
for root, dirnames, filenames in os.walk(file_path):
|
for root, dirnames, filenames in os.walk(file_path):
|
||||||
for name in filenames:
|
for name in filenames:
|
||||||
if name.endswith('.py'):
|
if name.endswith('.py'):
|
||||||
@@ -77,6 +80,8 @@ class TestCase(object):
|
|||||||
def __init__(self, operation, path, line, column, traceback=None):
|
def __init__(self, operation, path, line, column, traceback=None):
|
||||||
if operation not in self.operations:
|
if operation not in self.operations:
|
||||||
raise ValueError("%s is not a valid operation" % operation)
|
raise ValueError("%s is not a valid operation" % operation)
|
||||||
|
|
||||||
|
# Set other attributes
|
||||||
self.operation = operation
|
self.operation = operation
|
||||||
self.path = path
|
self.path = path
|
||||||
self.line = line
|
self.line = line
|
||||||
@@ -86,8 +91,8 @@ class TestCase(object):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def from_cache(cls, record):
|
def from_cache(cls, record):
|
||||||
with open(record) as f:
|
with open(record) as f:
|
||||||
dct = json.load(f)
|
args = json.load(f)
|
||||||
return cls(**dct)
|
return cls(*args)
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
'completions', 'goto_assignments', 'goto_definitions', 'usages',
|
'completions', 'goto_assignments', 'goto_definitions', 'usages',
|
||||||
@@ -121,8 +126,9 @@ class TestCase(object):
|
|||||||
except Exception:
|
except Exception:
|
||||||
self.traceback = traceback.format_exc()
|
self.traceback = traceback.format_exc()
|
||||||
if record is not None:
|
if record is not None:
|
||||||
|
call_args = (self.operation, self.path, self.line, self.column, self.traceback)
|
||||||
with open(record, 'w') as f:
|
with open(record, 'w') as f:
|
||||||
json.dump(self.__dict__, f)
|
json.dump(call_args, f)
|
||||||
self.show_errors()
|
self.show_errors()
|
||||||
if debugger:
|
if debugger:
|
||||||
einfo = sys.exc_info()
|
einfo = sys.exc_info()
|
||||||
@@ -179,6 +185,7 @@ class TestCase(object):
|
|||||||
"\tline: {line}\n"
|
"\tline: {line}\n"
|
||||||
"\tcolumn: {column}").format(**self.__dict__))
|
"\tcolumn: {column}").format(**self.__dict__))
|
||||||
|
|
||||||
|
|
||||||
def main(arguments):
|
def main(arguments):
|
||||||
debugger = 'pdb' if arguments['--pdb'] else \
|
debugger = 'pdb' if arguments['--pdb'] else \
|
||||||
'ipdb' if arguments['--ipdb'] else \
|
'ipdb' if arguments['--ipdb'] else \
|
||||||
@@ -196,7 +203,8 @@ def main(arguments):
|
|||||||
else:
|
else:
|
||||||
t.run(debugger)
|
t.run(debugger)
|
||||||
elif arguments['run']:
|
elif arguments['run']:
|
||||||
TestCase(arguments['<operation>'], arguments['<path>'],
|
TestCase(
|
||||||
|
arguments['<operation>'], arguments['<path>'],
|
||||||
int(arguments['<line>']), int(arguments['<column>'])
|
int(arguments['<line>']), int(arguments['<column>'])
|
||||||
).run(debugger, print_result=True)
|
).run(debugger, print_result=True)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user