Move more stuff from gradual/typing.py to gradual/base.py

jedi/inference/value/function.py

@@ -283,7 +283,7 @@ class BaseFunctionExecutionContext(ValueContext, TreeContextMixin):
         inference_state = self.inference_state
         is_coroutine = self.tree_node.parent.type in ('async_stmt', 'async_funcdef')
         is_generator = bool(get_yield_exprs(inference_state, self.tree_node))
-        from jedi.inference.gradual.typing import GenericClass
+        from jedi.inference.gradual.base import GenericClass
 
         if is_coroutine:
             if is_generator:

jedi/inference/value/iterable.py

@@ -194,7 +194,7 @@ class Sequence(LazyAttributeOverwrite, IterableMixin):
         return (self.merge_types_of_iterate().py__class__(),)
 
     def _get_wrapped_value(self):
-        from jedi.inference.gradual.typing import GenericClass
+        from jedi.inference.gradual.base import GenericClass
         klass = compiled.builtin_from_name(self.inference_state, self.array_type)
         c, = GenericClass(klass, self._get_generics()).execute_annotation()
         return c

jedi/inference/value/klass.py

@@ -266,7 +266,7 @@ class ClassValue(use_metaclass(CachedMetaClass, ClassMixin, FunctionAndClassBase
         )]
 
     def py__getitem__(self, index_value_set, contextualized_node):
-        from jedi.inference.gradual.typing import LazyGenericClass
+        from jedi.inference.gradual.base import LazyGenericClass
         if not index_value_set:
             return ValueSet([self])
         return ValueSet(
@@ -279,7 +279,7 @@ class ClassValue(use_metaclass(CachedMetaClass, ClassMixin, FunctionAndClassBase
         )
 
     def define_generics(self, type_var_dict):
-        from jedi.inference.gradual.typing import GenericClass
+        from jedi.inference.gradual.base import GenericClass
 
         def remap_type_vars():
             """