remove a bunch of dead code

Author: mkurnikov

mypy_django_plugin/lib/chk_helpers.py

@@ -24,9 +24,6 @@ def add_new_class_for_current_module(current_module: MypyFile,
     new_typeinfo = helpers.new_typeinfo(new_class_unique_name,
                                         bases=bases,
                                         module_name=current_module.fullname)
-    # new_typeinfo = helpers.make_new_typeinfo_in_current_module(new_class_unique_name,
-    #                                                            bases=bases,
-    #                                                            current_module_fullname=current_module.fullname)
     # add fields
     if fields:
         for field_name, field_type in fields.items():

mypy_django_plugin/lib/helpers.py

@@ -3,9 +3,6 @@
     TYPE_CHECKING, Any, Dict, Iterable, Iterator, List, Optional, Tuple, Union, cast,
 )
 
-from django.db.models.fields import Field
-from django.db.models.fields.related import RelatedField
-from django.db.models.fields.reverse_related import ForeignObjectRel
 from mypy.checker import TypeChecker
 from mypy.mro import calculate_mro
 from mypy.nodes import (
@@ -121,22 +118,6 @@ def __call__(self, ctx: DynamicClassDefContext) -> None:
         self.semanal_api = cast(SemanticAnalyzer, ctx.api)
         self.create_new_dynamic_class()
 
-    def get_callee(self) -> MemberExpr:
-        callee = self.call_expr.callee
-        assert isinstance(callee, MemberExpr)
-        return callee
-
-    def lookup_same_module_or_defer(self, name: str, *,
-                                    deferral_context: Optional[Context] = None) -> Optional[SymbolTableNode]:
-        sym = self.semanal_api.lookup_qualified(name, self.call_expr)
-        if sym is None or sym.node is None or isinstance(sym.node, PlaceholderNode):
-            deferral_context = deferral_context or self.call_expr
-            if not self.defer_till_next_iteration(deferral_context,
-                                                  reason=f'{self.semanal_api.cur_mod_id}.{name} does not exist'):
-                raise new_helpers.NameNotFound(name)
-            return None
-        return sym
-
     @abstractmethod
     def create_new_dynamic_class(self) -> None:
         raise NotImplementedError
@@ -343,21 +324,6 @@ def get_private_descriptor_type(type_info: TypeInfo, private_field_name: str, is
     return AnyType(TypeOfAny.explicit)
 
 
-def get_field_lookup_exact_type(api: AnyPluginAPI, field: Field) -> MypyType:
-    if isinstance(field, (RelatedField, ForeignObjectRel)):
-        lookup_type_class = field.related_model
-        rel_model_info = lookup_class_typeinfo(api, lookup_type_class)
-        if rel_model_info is None:
-            return AnyType(TypeOfAny.from_error)
-        return make_optional(Instance(rel_model_info, []))
-
-    field_info = lookup_class_typeinfo(api, field.__class__)
-    if field_info is None:
-        return AnyType(TypeOfAny.explicit)
-    return get_private_descriptor_type(field_info, '_pyi_lookup_exact_type',
-                                       is_nullable=field.null)
-
-
 def get_current_module(api: AnyPluginAPI) -> MypyFile:
     if isinstance(api, SemanticAnalyzer):
         return api.cur_mod_node
@@ -423,3 +389,10 @@ def new_typeinfo(name: str,
 
     class_def.info = info
     return info
+
+
+def get_nested_meta_node_for_current_class(info: TypeInfo) -> Optional[TypeInfo]:
+    metaclass_sym = info.names.get('Meta')
+    if metaclass_sym is not None and isinstance(metaclass_sym.node, TypeInfo):
+        return metaclass_sym.node
+    return None

mypy_django_plugin/lib/sem_helpers.py

@@ -4,12 +4,12 @@
 from mypy.types import Type as MypyType
 from mypy.types import TypeType
 
-from mypy_django_plugin.lib import chk_helpers, helpers, sem_helpers
+from mypy_django_plugin.lib import chk_helpers, helpers
 
 
 class FormCallback(helpers.ClassDefPluginCallback):
     def modify_class_defn(self) -> None:
-        meta_node = sem_helpers.get_nested_meta_node_for_current_class(self.class_defn.info)
+        meta_node = helpers.get_nested_meta_node_for_current_class(self.class_defn.info)
         if meta_node is None:
             return None
         meta_node.fallback_to_any = True

mypy_django_plugin/transformers/forms.py

@@ -15,7 +15,7 @@
 from mypy.types import Type as MypyType
 from mypy.types import TypeOfAny
 
-from mypy_django_plugin.lib import fullnames, helpers, sem_helpers
+from mypy_django_plugin.lib import fullnames, helpers
 from mypy_django_plugin.transformers import fields, new_helpers
 
 
@@ -178,7 +178,7 @@ class Meta(Any):
     """
 
     def modify_class_defn(self) -> None:
-        meta_node = sem_helpers.get_nested_meta_node_for_current_class(self.class_defn.info)
+        meta_node = helpers.get_nested_meta_node_for_current_class(self.class_defn.info)
         if meta_node is None:
             return None
         meta_node.fallback_to_any = True