Minor refactoring

This commit is contained in:
Dave Halter
2020-03-17 10:00:38 +01:00
parent 6dda514ec6
commit 7de475318a

View File

@@ -123,23 +123,17 @@ def _assert_interpreter_complete(source, namespace, completions,
def test_complete_raw_function(): def test_complete_raw_function():
from os.path import join from os.path import join
_assert_interpreter_complete('join("").up', _assert_interpreter_complete('join("").up', locals(), ['upper'])
locals(),
['upper'])
def test_complete_raw_function_different_name(): def test_complete_raw_function_different_name():
from os.path import join as pjoin from os.path import join as pjoin
_assert_interpreter_complete('pjoin("").up', _assert_interpreter_complete('pjoin("").up', locals(), ['upper'])
locals(),
['upper'])
def test_complete_raw_module(): def test_complete_raw_module():
import os import os
_assert_interpreter_complete('os.path.join("a").up', _assert_interpreter_complete('os.path.join("a").up', locals(), ['upper'])
locals(),
['upper'])
def test_complete_raw_instance(): def test_complete_raw_instance():
@@ -148,31 +142,19 @@ def test_complete_raw_instance():
completions = ['time', 'timetz', 'timetuple'] completions = ['time', 'timetz', 'timetuple']
if is_py3: if is_py3:
completions += ['timestamp'] completions += ['timestamp']
_assert_interpreter_complete('(dt - dt).ti', _assert_interpreter_complete('(dt - dt).ti', locals(), completions)
locals(),
completions)
def test_list(): def test_list():
array = ['haha', 1] array = ['haha', 1]
_assert_interpreter_complete('array[0].uppe', _assert_interpreter_complete('array[0].uppe', locals(), ['upper'])
locals(), _assert_interpreter_complete('array[0].real', locals(), [])
['upper'])
_assert_interpreter_complete('array[0].real',
locals(),
[])
# something different, no index given, still just return the right # something different, no index given, still just return the right
_assert_interpreter_complete('array[int].real', _assert_interpreter_complete('array[int].real', locals(), ['real'])
locals(), _assert_interpreter_complete('array[int()].real', locals(), ['real'])
['real'])
_assert_interpreter_complete('array[int()].real',
locals(),
['real'])
# inexistent index # inexistent index
_assert_interpreter_complete('array[2].upper', _assert_interpreter_complete('array[2].upper', locals(), ['upper'])
locals(),
['upper'])
def test_getattr(): def test_getattr():
@@ -186,9 +168,7 @@ def test_slice():
class Foo1: class Foo1:
bar = [] bar = []
baz = 'xbarx' baz = 'xbarx'
_assert_interpreter_complete('getattr(Foo1, baz[1:-1]).append', _assert_interpreter_complete('getattr(Foo1, baz[1:-1]).append', locals(), ['append'])
locals(),
['append'])
def test_getitem_side_effects(): def test_getitem_side_effects():