chore(code) remove Generator

Author: antechrestos

cloudfoundry_client/common_objects.py

@@ -1,5 +1,5 @@
 import json
-from collections.abc import Callable
+from collections.abc import Callable, Generator
 from typing import TypeVar, Generic
 
 
@@ -19,7 +19,7 @@ def __init__(self, *args, **kwargs):
 ENTITY = TypeVar('ENTITY')
 
 
-class Pagination(Generic[ENTITY]):
+class Pagination(Generic[ENTITY], Generator[ENTITY, None, None]):
     def __init__(self, first_page: JsonObject,
                  total_result: int,
                  next_page_loader: Callable[[JsonObject], JsonObject | None],
@@ -37,10 +37,7 @@ def __init__(self, first_page: JsonObject,
     def total_results(self) -> int:
         return self._total_results
 
-    def __iter__(self):
-        return self
-
-    def __next__(self) -> ENTITY:
+    def send(self, value) -> ENTITY:
         try:
             if self._cursor is None:
                 self._current_page = self._first_page
@@ -52,3 +49,15 @@ def __next__(self) -> ENTITY:
                 raise
             self._cursor = self._resources_accessor(self._current_page).__iter__()
             return self._instance_creator(self._cursor.__next__())
+
+    def throw(self, typ, val=None, tb=None):
+        super().throw(typ, val, tb)
+
+    def close(self):
+        super().close()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self) -> ENTITY:
+        return self.send(None)

cloudfoundry_client/doppler/client.py

@@ -1,6 +1,6 @@
 import logging
 import re
-from typing import Generator
+from collections.abc import Generator
 from urllib.parse import urlparse
 
 from oauth2_client.credentials_manager import CredentialManager

cloudfoundry_client/networking/entities.py

@@ -1,7 +1,7 @@
 import logging
-from collections.abc import Callable
+from collections.abc import Callable, Generator
 from functools import reduce
-from typing import Any, Generator, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 from urllib.parse import quote
 
 from requests import Response

cloudfoundry_client/operations/push/file_helper.py

@@ -2,8 +2,7 @@
 import os
 import stat
 import zipfile
-from collections.abc import Callable
-from typing import Generator
+from collections.abc import Callable, Generator
 
 
 class FileHelper(object):

cloudfoundry_client/v2/events.py

@@ -1,4 +1,5 @@
-from typing import Generator, TYPE_CHECKING
+from collections.abc import Generator
+from typing import TYPE_CHECKING
 
 from cloudfoundry_client.v2.entities import EntityManager, Entity