Merge 0632ce4 into 6eb8c0a

.gitignore

@@ -1,5 +1,8 @@
 *.py[cod]
 
+.idea
+venv
+
 # C extensions
 *.so
 

.travis.yml

@@ -1,9 +1,14 @@
 language: python
+matrix:
+  include:
+    - python: 3.5
+      env: TOXENV=py35
 env:
   - TOXENV=py26
   - TOXENV=py27
   - TOXENV=py33
   - TOXENV=py34
+  - TOXENV=py35
   - TOXENV=pypy
 install:
   - travis_retry pip install coveralls tox==1.6.1

diff_cover/report_generator.py

@@ -5,8 +5,8 @@
 from abc import ABCMeta, abstractmethod
 from jinja2 import Environment, PackageLoader
 from jinja2_pluralize import pluralize_dj
-from lazy import lazy
 from diff_cover.snippets import Snippet
+import lazy
 import six
 
 
@@ -155,7 +155,7 @@ def total_percent_covered(self):
         else:
             return 100
 
-    @lazy
+    @lazy.lazy
     def _diff_violations(self):
         """
         Returns a dictionary of the form:

pylintrc

@@ -85,10 +85,6 @@ reports=no
 # (RP0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (RP0004).
-comment=no
-
 
 [TYPECHECK]
 
@@ -100,10 +96,6 @@ ignore-mixin-members=yes
 # (useful for classes with attributes dynamically set).
 ignored-classes=SQLObject
 
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed. Python regular
 # expressions are accepted.
@@ -125,9 +117,6 @@ generated-members=
 
 [BASIC]
 
-# Required attributes for module, separated by a comma
-required-attributes=
-
 # List of builtins function names that should not be used, separated by a comma
 bad-functions=map,filter,apply,input
 
@@ -269,10 +258,6 @@ max-public-methods=20
 
 [CLASSES]
 
-# List of interface methods to ignore, separated by a comma. This is used for
-# instance to not check methods defines in Zope's Interface base class.
-ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
-
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy
+envlist = py26, py27, py33, py34, py35, pypy
 
 [testenv]
 whitelist_externals =