Skip to content

Commit

Permalink
Merge pull request #348 from dineshtrivedi/276
Browse files Browse the repository at this point in the history
276 - Fixing Macos AttributeError: Can't pickle local object
  • Loading branch information
carlio authored Feb 16, 2022
2 parents f43c8bd + e0905e2 commit 4e33e90
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 14 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
* [michael-k](https://github.com/michael-k)
* [naquiroz](https://github.com/naquiroz)
* [john-sandall](https://github.com/john-sandall)
* [dineshtrivedi](https://github.com/dineshtrivedi)
31 changes: 17 additions & 14 deletions pylint_django/augmentations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,13 +645,13 @@ def is_model_test_case_subclass(node):
return node_is_subclass(node, "django.test.testcases.TestCase")


def generic_is_view_attribute(parents, attrs):
"""Generates is_X_attribute function for given parents and attrs."""
class IsAttribute:
def __init__(self, parents, attrs):
self.parents = parents
self.attrs = attrs

def is_attribute(node):
return _attribute_is_magic(node, attrs, parents)

return is_attribute
def __call__(self, node):
return _attribute_is_magic(node, self.attrs, self.parents)


def is_model_view_subclass_method_shouldnt_be_function(node):
Expand Down Expand Up @@ -756,9 +756,12 @@ def allow_meta_protected_access(node):
return False


def is_class(class_name):
"""Shortcut for node_is_subclass."""
return lambda node: node_is_subclass(node, class_name)
class IsClass:
def __init__(self, class_name):
self.class_name = class_name

def __call__(self, node):
return node_is_subclass(node, self.class_name)


def wrap(orig_method, with_method):
Expand Down Expand Up @@ -858,37 +861,37 @@ def apply_augmentations(linter):
linter,
TypeChecker.visit_attribute,
"no-member",
generic_is_view_attribute(parents, attrs),
IsAttribute(parents, attrs),
)

# formviews have too many ancestors, there's nothing the user of the library can do about that
suppress_message(
linter,
MisdesignChecker.visit_classdef,
"too-many-ancestors",
is_class("django.views.generic.edit.FormView"),
IsClass("django.views.generic.edit.FormView"),
)

# class-based generic views just have a longer inheritance chain
suppress_message(
linter,
MisdesignChecker.visit_classdef,
"too-many-ancestors",
is_class("django.views.generic.detail.BaseDetailView"),
IsClass("django.views.generic.detail.BaseDetailView"),
)
suppress_message(
linter,
MisdesignChecker.visit_classdef,
"too-many-ancestors",
is_class("django.views.generic.edit.ProcessFormView"),
IsClass("django.views.generic.edit.ProcessFormView"),
)

# model forms have no __init__ method anywhere in their bases
suppress_message(
linter,
ClassChecker.visit_classdef,
"W0232",
is_class("django.forms.models.ModelForm"),
IsClass("django.forms.models.ModelForm"),
)

# Meta
Expand Down
11 changes: 11 additions & 0 deletions pylint_django/tests/test_func.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import csv
import os
import pickle
import sys

import pylint
Expand Down Expand Up @@ -112,5 +113,15 @@ def test_migrations_plugin(test_file):
LintTest._runTest()


@pytest.mark.parametrize("test_file", MIGRATIONS_TESTS[:1], ids=MIGRATIONS_TESTS_NAMES[:1])
def test_linter_should_be_pickleable_with_pylint_djang_plugin_installed(test_file):
LintTest = PylintDjangoMigrationsTest(test_file)
LintTest.setUp()

# LintModuleTest sets reporter to instance of FunctionalTestReporter that is not picklable
LintTest._linter.reporter = None
pickle.dumps(LintTest._linter)


if __name__ == "__main__":
sys.exit(pytest.main(sys.argv))

0 comments on commit 4e33e90

Please sign in to comment.