removed debugger statements and added internal caching

PirosB3 · Jun 27, 2014 · 69b292a · 69b292a
1 parent ae19dfd
commit 69b292a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
@@ -565,7 +565,6 @@ def generate_deleted_models(self):
             model = self.old_apps.get_model(app_label, model_name)
             # Gather related fields
             related_fields = {}
-            import ipdb; ipdb.set_trace()
             for field in model._meta.local_fields:
                 if field.rel:
                     if field.rel.to:

diff --git a/django/db/models/options.py b/django/db/models/options.py
@@ -145,12 +145,16 @@ def non_swapped_models(self):
     #@cached_property
     @property
     def _field_map(self):
-        types = ALL
-        res = {}
-        for field, names in self.get_new_fields(types=types, recursive=True).iteritems():
-            for name in names:
-                res[name] = field
-        return res
+        try:
+            return self._field_map_cache
+        except AttributeError:
+            types = ALL
+            res = {}
+            for field, names in self.get_new_fields(types=types, recursive=True).iteritems():
+                for name in names:
+                    res[name] = field
+            self._field_map_cache = res
+            return res
 
     def get_new_field(self, field_name):
         try:
@@ -322,6 +326,10 @@ def _prepare(self, model):
     def _expire_cache(self):
         #if hasattr(self, '_field_map'):
             #del self._field_map
+        try:
+            del self._field_map_cache
+        except AttributeError:
+            pass
         self._get_new_fields_cache = {}
 
     def add_field(self, field):

diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py
@@ -701,7 +701,6 @@ def test_foreign_key_removed_before_target_model(self):
         after = self.make_project_state([self.author_name])  # removes both the model and FK
         autodetector = MigrationAutodetector(before, after)
         changes = autodetector._detect_changes()
-        import ipdb; ipdb.set_trace()
         # Right number of migrations?
         self.assertEqual(len(changes['testapp']), 1)
         # Right number of actions?