Merge updated fork

.travis.yml

@@ -1,18 +1,21 @@
 sudo: false
 language: python
 python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
   - "3.5"
+  - "3.6"
 env:
-  - DJANGO='Django>=1.7,<1.8' SKIP='2.6 3.5'
-  - DJANGO='Django>=1.8,<1.9' SKIP='2.6'
-  - DJANGO='Django>=1.9,<1.10' SKIP='2.6 3.3'
-  - DJANGO='Django>=1.10,<1.11' SKIP='2.6 3.3'
+  - DJANGO="1.11,<2.0"
+  - DJANGO="2.0,<3.0"
+
 install:
-  scripts/travis-install.sh
+  - pip install coverage coveralls djangorestframework psycopg2
+  - pip install "Django>=$DJANGO"
+  - pip install git+https://github.com/landscapeio/pylint-plugin-utils.git@master
 script:
-  scripts/travis-build.sh
+  - PYTHONPATH=. coverage run test/test_func.py
 after_success:
   coveralls
+notifications:
+  email:
+    on_failure: change
+    on_success: never

CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## Version 0.8.0 (unreleased)
+
+* [#109](http://github.com/landscapeio/pylint-django/pull/109),
+  adding 'urlpatterns', 'register', 'app_name' to good names. Obsoletes
+  [#111](http://github.com/landscapeio/pylint-django/pull/111), fixes
+  [#108](http://github.com/landscapeio/pylint-django/issues/108)
+  (Vinay Pai)
+* Add 'handler500' to good names (Mr. Senko)
+* [#103](http://github.com/landscapeio/pylint-django/pull/103):
+  Support factory_boy's DjangoModelFactory Meta class (Konstantinos Koukopoulos)
+* [#100](https://github.com/landscapeio/pylint-django/pull/100):
+  Fix E1101:Instance of '__proxy__' has no 'format' member' when using .format()
+  on a ugettext_lazy translation. Fixes
+  [#80](https://github.com/landscapeio/pylint-django/issues/80) (canarduck)
+* [#99](https://github.com/landscapeio/pylint-django/pull/99):
+  Add tests and transforms for DurationField, fixes
+  [#95](https://github.com/landscapeio/pylint-django/issues/95) (James M. Allen)
+* [#92](https://github.com/landscapeio/pylint-django/pull/92):
+  Add json field to WSGIRequest proxy (sjk4sc)
+* [#84](https://github.com/landscapeio/pylint-django/pull/84):
+  Add support for django.contrib.postgres.fields and UUIDField (Villiers Strauss)
+* Stop testing with older Django versions. Currently testing with Django 1.11.x and 2.0
+* Stop testing on Python 2, no functional changes in the source code though
+* Update tests for latest version of pylint (>=1.8)
+
 ## Version 0.7.4
 * [#88](https://github.com/landscapeio/pylint-django/pull/88) Fixed builds with Django 1.10 (thanks to [federicobond](https://github.com/federicobond))
 * [#91](https://github.com/landscapeio/pylint-django/pull/91) Fixed race condition when running with pylint parallel execution mode (thanks to [jeremycarroll](https://github.com/jeremycarroll))

CONTRIBUTORS.md

@@ -5,4 +5,5 @@
 * [jproffitt](https://github.com/jproffitt)
 * [lhupfeldt](https://github.com/lhupfeldt)
 * [smirolo](https://github.com/smirolo)
-* [mbertolacci](https://github.com/mbertolacci)
+* [mbertolacci](https://github.com/mbertolacci)
+* [atodorov](https://github.com/atodorov)

pylint_django/augmentations/__init__.py

@@ -407,6 +407,16 @@ def is_model_meta_subclass(node):
     return node_is_subclass(node.parent, *parents)
 
 
+def is_model_factory_meta_subclass(node):
+    """Checks that node is derivative of DjangoModelFactory class."""
+    if node.name != 'Meta' or not isinstance(node.parent, ClassDef):
+        return False
+
+    parents = ('factory.django.DjangoModelFactory',
+               '.DjangoModelFactory',)
+    return node_is_subclass(node.parent, *parents)
+
+
 def is_model_mpttmeta_subclass(node):
     """Checks that node is derivative of MPTTMeta class."""
     if node.name != 'MPTTMeta' or not isinstance(node.parent, ClassDef):
@@ -715,15 +725,16 @@ def apply_augmentations(linter):
         suppress_message(linter, _visit_attribute(TypeChecker), 'E1101', generic_is_view_attribute(parents, attrs))
 
     # formviews have too many ancestors, there's nothing the user of the library can do about that
-    suppress_message(linter, _visit_class(MisdesignChecker), 'R0901', is_class('django.views.generic.edit.FormView'))
+    suppress_message(linter, _visit_class(MisdesignChecker), 'too-many-ancestors', is_class('django.views.generic.edit.FormView'))
 
     # model forms have no __init__ method anywhere in their bases
     suppress_message(linter, _visit_class(ClassChecker), 'W0232', is_class('django.forms.models.ModelForm'))
 
     # forms implement __getitem__ but not __len__, thus raising a "Badly implemented container" warning which
-    # we will suppress.
-    suppress_message(linter, _leave_class(MisdesignChecker), 'R0924', is_class('django.forms.forms.Form'))
-    suppress_message(linter, _leave_class(MisdesignChecker), 'R0924', is_class('django.forms.models.ModelForm'))
+    # we will suppress. NOTE: removed from pylint, https://github.com/PyCQA/pylint/issues/112
+    # keeping here in case it gets re-implemented
+    # suppress_message(linter, _leave_class(MisdesignChecker), 'R0924', is_class('django.forms.forms.Form'))
+    # suppress_message(linter, _leave_class(MisdesignChecker), 'R0924', is_class('django.forms.models.ModelForm'))
 
     # Meta
     suppress_message(linter, _visit_class(DocStringChecker), 'missing-docstring', is_model_meta_subclass)
@@ -739,14 +750,6 @@ def apply_augmentations(linter):
     suppress_message(linter, _visit_class(ClassChecker), 'no-init', is_model_media_subclass)
     suppress_message(linter, _leave_class(MisdesignChecker), 'too-few-public-methods', is_model_media_subclass)
 
-    # Too few public methods started appearing for Views and Models as part of Pylint>=1.4 / astroid>=1.3.3
-    # Not sure why, suspect this is a failure to get the parent classes somewhere
-    # For now, just suppress it on models and views
-    suppress_message(linter, _leave_class(MisdesignChecker), 'too-few-public-methods',
-                     is_class('.Model'))
-    suppress_message(linter, _leave_class(MisdesignChecker), 'too-few-public-methods',
-                     is_class('.View'))
-
     # Admin
     # Too many public methods (40+/20)
     # TODO: Count public methods of django.contrib.admin.options.ModelAdmin and increase
@@ -772,6 +775,12 @@ def apply_augmentations(linter):
     suppress_message(linter, _visit_class(ClassChecker), 'W0232', is_model_mpttmeta_subclass)
     suppress_message(linter, _leave_class(MisdesignChecker), 'too-few-public-methods', is_model_mpttmeta_subclass)
 
+    # factory_boy's DjangoModelFactory
+    suppress_message(linter, _visit_class(DocStringChecker), 'missing-docstring', is_model_factory_meta_subclass)
+    suppress_message(linter, _visit_class(NewStyleConflictChecker), 'old-style-class', is_model_factory_meta_subclass)
+    suppress_message(linter, _visit_class(ClassChecker), 'W0232', is_model_factory_meta_subclass)
+    suppress_message(linter, _leave_class(MisdesignChecker), 'too-few-public-methods', is_model_factory_meta_subclass)
+
     # ForeignKey and OneToOneField
     # Must update this in a thread safe way to support the parallel option on pylint (-j)
     current_leave_module = VariablesChecker.leave_module

pylint_django/plugin.py

@@ -16,13 +16,8 @@ def register(linter):
     However, we will also use it to amend existing checker config.
     """
     name_checker = get_checker(linter, NameChecker)
-    name_checker.config.good_names += ('qs',)
-
-    # Default pylint.checkers.base.CONST_NAME_RGX = re.compile('(([A-Z_][A-Z0-9_]*)|(__.*__))$').
-    start = name_checker.config.const_rgx.pattern[:-2]
-    end = name_checker.config.const_rgx.pattern[-2:]
-    const_rgx = '%s|(urls|urlpatterns|register)%s' % (start, end)
-    name_checker.config.const_rgx = re.compile(const_rgx)
+    name_checker.config.good_names += ('qs', 'urlpatterns', 'register', 'app_name',
+        'handler500')
 
     # we don't care about South migrations
     linter.config.black_list += ('migrations', 'south_migrations')

pylint_django/transforms/fields.py

@@ -9,10 +9,13 @@
 _INT_FIELDS = ('IntegerField', 'SmallIntegerField', 'BigIntegerField',
                'PositiveIntegerField', 'PositiveSmallIntegerField')
 _BOOL_FIELDS = ('BooleanField', 'NullBooleanField')
+_RANGE_FIELDS = ('RangeField', 'IntegerRangeField', 'BigIntegerRangeField',
+                 'FloatRangeField', 'DateTimeRangeField', 'DateRangeField')
 
 
 def is_model_field(cls):
-    return cls.qname().startswith('django.db.models.fields')
+    return cls.qname().startswith('django.db.models.fields') or \
+        cls.qname().startswith('django.contrib.postgres.fields')
 
 
 def is_form_field(cls):
@@ -45,10 +48,20 @@ def apply_type_shim(cls, context=None):  # noqa
         base_nodes = MANAGER.ast_from_module_name('datetime').lookup('time')
     elif cls.name == 'DateField':
         base_nodes = MANAGER.ast_from_module_name('datetime').lookup('date')
+    elif cls.name == 'DurationField':
+        base_nodes = MANAGER.ast_from_module_name('datetime').lookup('timedelta')
+    elif cls.name == 'UUIDField':
+        base_nodes = MANAGER.ast_from_module_name('uuid').lookup('UUID')
     elif cls.name == 'ManyToManyField':
         base_nodes = MANAGER.ast_from_module_name('django.db.models.query').lookup('QuerySet')
     elif cls.name in ('ImageField', 'FileField'):
         base_nodes = MANAGER.ast_from_module_name('django.core.files.base').lookup('File')
+    elif cls.name == 'ArrayField':
+        base_nodes = scoped_nodes.builtin_lookup('list')
+    elif cls.name in ('HStoreField', 'JSONField'):
+        base_nodes = scoped_nodes.builtin_lookup('dict')
+    elif cls.name in _RANGE_FIELDS:
+        base_nodes = MANAGER.ast_from_module_name('psycopg2._range').lookup('Range')
     else:
         return iter([cls])
 

pylint_django/transforms/transforms/django_contrib_postgres_fields.py

@@ -0,0 +1,47 @@
+from django.contrib.postgres import fields as django_fields
+from psycopg2 import extras
+
+
+# --------
+# lists
+
+class ArrayField(list, django_fields.ArrayField):
+    pass
+
+
+# --------
+# dicts
+
+class HStoreField(dict, django_fields.HStoreField):
+    pass
+
+
+class JSONField(dict, django_fields.JSONField):
+    pass
+
+
+# --------
+# ranges
+
+class RangeField(extras.Range, django_fields.RangeField):
+    pass
+
+
+class IntegerRangeField(extras.NumericRange, django_fields.IntegerRangeField):
+    pass
+
+
+class BigIntegerRangeField(extras.NumericRange, django_fields.BigIntegerRangeField):
+    pass
+
+
+class FloatRangeField(extras.NumericRange, django_fields.FloatRangeField):
+    pass
+
+
+class DateTimeRangeField(extras.DateTimeTZRange, django_fields.DateRangeField):
+    pass
+
+
+class DateRangeField(extras.DateRange, django_fields.DateRangeField):
+    pass

pylint_django/transforms/transforms/django_core_handlers_wsgi.py

@@ -4,3 +4,4 @@
 class WSGIRequest(WSGIRequestOriginal):
     status_code = None
     content = ''
+    json = None

pylint_django/transforms/transforms/django_db_models_fields.py

@@ -1,6 +1,7 @@
 from django.db.models import fields as django_fields
 import datetime
 from decimal import Decimal
+from uuid import UUID
 
 
 # --------
@@ -110,6 +111,12 @@ def __new__(cls, verbose_name=None, name=None, auto_now=False,
             pass
 
 
+class DurationField(datetime.timedelta, django_fields.DurationField):
+    if PY3:
+        def __new__(cls, verbose_name=None, name=None, **kwargs):
+            pass
+
+
 # -------
 # misc
 
@@ -119,3 +126,7 @@ class GenericIPAddressField(str, django_fields.GenericIPAddressField):
 
 class IPAddressField(str, django_fields.IPAddressField):
     pass
+
+
+class UUIDField(UUID, django_fields.UUIDField):
+    pass

pylint_django/transforms/transforms/django_forms_fields.py

@@ -101,7 +101,13 @@ def __new__(cls, input_formats=None, *args, **kwargs):
             pass
 
 
-    # --------
+class DurationField(datetime.timedelta, django_fields.DurationField):
+    if PY3:
+        def __new__(cls, *args, **kwargs):
+            pass
+
+
+# --------
 # choice
 
 class ChoiceField(object, django_fields.ChoiceField):

pylint_django/transforms/transforms/django_utils_translation.py

@@ -1 +1 @@
-ugettext_lazy = lambda x: None
+ugettext_lazy = lambda x: ''

scripts/test.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-python test/test_func.py
+PYTHONPATH=. python test/test_func.py

setup.py

@@ -25,10 +25,9 @@
     'Intended Audience :: Developers',
     'Operating System :: Unix',
     'Topic :: Software Development :: Quality Assurance',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
 )
 
 

test/external_drf/func_noerror_serializer.py → test/input/external_drf_noerror_serializer.py

@@ -1,11 +1,10 @@
 """
 Checks that Pylint does not complain about DRF serializers
 """
-#  pylint: disable=C0111,W5101,R0903
+#  pylint: disable=C0111,W5101
 
 from rest_framework import serializers
 
 class TestSerializerSubclass(serializers.ModelSerializer):
     class Meta:
         pass
-

test/input/external_drf_noerror_serializer.rc

@@ -0,0 +1,2 @@
+[testoptions]
+requires = rest_framework