[refs #58] Merging PR58 and fixing conflicts with previous fix for _locals access

Author: carlio

pylint_django/transforms/__init__.py

@@ -28,9 +28,9 @@ def set_fake_locals(module):
         for class_name in class_names:
             # This changed from locals to _locals between astroid 1.3 and 1.4
             if hasattr(module, '_locals'):
-                module._locals[class_name] = fake._locals[class_name]  # pylint: disable=protected-access
+                module._locals[class_name].extend(fake._locals[class_name])  # pylint: disable=protected-access
             else:
-                module.locals[class_name] = fake.locals[class_name]
+                module.locals[class_name].extend(fake.locals[class_name])
 
     MANAGER.register_transform(nodes.Module, set_fake_locals)
 

test/input/func_noerror_model_methods.py

@@ -0,0 +1,16 @@
+"""
+Checks that Pylint does not complain about using Model and Manager methods
+"""
+#  pylint: disable=C0111,W5101,W5103
+from django.db import models
+
+
+class SomeModel(models.Model):
+    pass
+
+if __name__ == '__main__':
+    MODEL = SomeModel()
+    MODEL.save()
+    MODEL.delete()
+
+    COUNT = SomeModel.objects.count()