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
@@ -66,7 +66,7 @@ class MixedName(compiled.CompiledName):
        contexts = list(self.infer())
        if not contexts:
            # This means a start_pos that doesn't exist (compiled objects).
-            return (0, 0)
+            return 0, 0
        return contexts[0].name.start_pos

    @start_pos.setter