While you're touching this code, we might as well change this to the non-deprecated form `if name in self.datasources:`