Using local copy of pylint.testutils if import fails

scripts/test.sh

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

scripts/travis-build.sh

@@ -3,7 +3,7 @@ python scripts/travis_skip.py
 
 if [ "$?" -eq "0" ]
 then
-    coverage run test/test_func.py
+    coverage run -m test.test_func
 else
     echo "Skipping"
 fi

test/input/func_noerror_form_fields.py

@@ -23,7 +23,7 @@ class ManyFieldsForm(forms.Form):
     imagefield = forms.ImageField(name='test_image', upload_to='test')
     # note: IPAdressField has been deprecated since django 1.7 so might not
     # be available if using django 1.8+
-    ipaddressfield = getattr(forms, 'IPAddressField', 'GenericIPAddressField')()
+    ipaddressfield = getattr(forms, 'IPAddressField', getattr(forms, 'GenericIPAddressField'))()
     intfield = forms.IntegerField(null=True)
     nullbooleanfield = forms.NullBooleanField()
     slugfield = forms.SlugField()

test/test_func.py

@@ -3,9 +3,13 @@
 import sys
 import unittest
 from django.conf import settings
-from pylint.testutils import make_tests, LintTestUsingFile, cb_test_gen, linter
 from pylint_django.compat import django_version
 
+try:
+    from pylint.testutils import make_tests, LintTestUsingFile, cb_test_gen, linter
+except ImportError:
+    from .testutils import make_tests, LintTestUsingFile, cb_test_gen, linter
+
 
 settings.configure()