From 10a343847205802becb1079de5efbef9e6271874 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Sun, 14 Jul 2019 11:16:46 +1000 Subject: [PATCH] satisfactory: Correct the generator typing for Cookbook --- satisfactory/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/satisfactory/__init__.py b/satisfactory/__init__.py index 9942279..0b5dda9 100644 --- a/satisfactory/__init__.py +++ b/satisfactory/__init__.py @@ -1,7 +1,8 @@ import os import json -from typing import Dict, Generator +from typing import Dict, Generator, Iterable + class Cookbook(object): __recipes: Dict[str, Dict] @@ -19,7 +20,7 @@ class Cookbook(object): def __getitem__(self, item: str) -> Dict[str, Dict]: return self.__recipes[item] - def all(self): + def all(self) -> Iterable[str]: return self.__recipes.keys() def recipes(self, name: str) -> Dict: @@ -28,11 +29,11 @@ class Cookbook(object): def is_component(self, name: str) -> bool: return 'component' in self.__recipes[name]['type'] - def components(self) -> Generator[Dict, None, None]: + def components(self) -> Generator[str, None, None]: return (i for i in self.all() if self.is_component(i)) def is_resource(self, name: str) -> bool: return 'resource' in self.__recipes[name]['type'] - def resources(self) -> Generator[Dict, None, None]: + def resources(self) -> Generator[str, None, None]: return (i for i in self.all() if self.is_resource(i))