Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
This commit is contained in:
Dave Halter
2018-01-20 18:58:43 +01:00
48 changed files with 205 additions and 210 deletions

View File

@@ -34,7 +34,7 @@ def test_follow_import_incomplete(Script):
# incomplete `from * import` part
datetime = check_follow_definition_types(Script, "from datetime import datetim")
assert set(datetime) == set(['class', 'instance']) # py33: builtin and pure py version
assert set(datetime) == {'class', 'instance'} # py33: builtin and pure py version
# os.path check
ospath = check_follow_definition_types(Script, "from os.path import abspat")