Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
2018-01-20 18:58:43 +01:00
parent 19b3580ba7 877383b110
commit d986c44b94
48 changed files with 205 additions and 210 deletions
--- a/test/run.py
+++ b/test/run.py
@@ -206,7 +206,7 @@ class IntegrationTestCase(object):
        completions = self.script(environment).completions()
        #import cProfile; cProfile.run('script.completions()')

-        comp_str = set([c.name for c in completions])
+        comp_str = {c.name for c in completions}
        return compare_cb(self, comp_str, set(literal_eval(self.correct)))

    def run_goto_definitions(self, compare_cb, environment):