Merge branch 'master' into develop

Author: carlio

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.7
+* [#51](https://github.com/landscapeio/pylint-django/issues/51) - Fixed compatibility with pylint 1.5 / astroid 1.4.1
+
 ## Version 0.6.1
 * [#43](https://github.com/landscapeio/pylint-django/issues/43) - Foreign key ID access (`somefk_id`) does not raise an 'attribute not found' warning
 * [#31](https://github.com/landscapeio/pylint-django/issues/31) - Support for custom model managers (thanks [smirolo](https://github.com/smirolo))

pylint_django/transforms/fields.py

@@ -1,4 +1,5 @@
 from astroid import MANAGER, scoped_nodes, nodes, inference_tip
+import sys
 from pylint_django import utils
 
 
@@ -33,7 +34,11 @@ def apply_type_shim(cls, context=None):
     elif cls.name == 'FloatField':
         base_nodes = scoped_nodes.builtin_lookup('float')
     elif cls.name == 'DecimalField':
-        base_nodes = MANAGER.ast_from_module_name('decimal').lookup('Decimal')
+        if sys.versioninfo >= (3, 5):
+            # I dunno, I'm tired and this works :(
+            base_nodes = MANAGER.ast_from_module_name('_decimal').lookup('Decimal')
+        else:
+            base_nodes = MANAGER.ast_from_module_name('decimal').lookup('Decimal')
     elif cls.name in ('SplitDateTimeField', 'DateTimeField'):
         base_nodes = MANAGER.ast_from_module_name('datetime').lookup('datetime')
     elif cls.name == 'TimeField':