Merge remote-tracking branch 'upstream/dev' into fix_runtime_error

Conflicts:
	jedi/evaluate/imports.py
This commit is contained in:
ColinDuquesnoy
2014-09-29 11:49:21 +02:00
25 changed files with 519 additions and 413 deletions

View File

@@ -240,7 +240,6 @@ class CompiledName(FakeName):
super(CompiledName, self).__init__(name)
self._obj = obj
self.name = name
self.start_pos = 0, 0 # an illegal start_pos, to make sorting easy.
def __repr__(self):
try: