Merge branch 'develop-cleaned'

prospector/finder.py

@@ -160,7 +160,7 @@ def _find_paths(ignore, curpath, rootpath):
         if os.path.isdir(fullpath):
 
             # is it probably a virtualenvironment?
-            if is_virtualenv(fullpath):
+            if is_virtualenv(fullpath) or '.tox' in fullpath:
                 continue
 
             # this is a directory

prospector/profiles/profile.py

@@ -356,4 +356,7 @@ def _load_profile(name_or_path, profile_path, shorthands_found=None,
         inherit_order += new_il
         shorthands_found |= new_sh
 
-    return contents_dict, inherit_order, shorthands_found
+    # note: a new list is returned here rather than simply using inherit_order to give astroid a
+    # clue about the type of the returned object, as otherwise it can recurse infinitely and crash,
+    # this meaning that prospector does not run on prospector cleanly!
+    return contents_dict, list(inherit_order), shorthands_found

prospector/tools/pylint/collector.py

@@ -13,6 +13,10 @@ def __init__(self, message_store):
         self._message_store = message_store
         self._messages = []
 
+    def handle_message(self, msg):
+        location = (msg.abspath, msg.module, msg.obj, msg.line, msg.column)
+        self.add_message(msg.msg_id, location, msg.msg)
+
     def add_message(self, msg_id, location, msg):
         # (* magic is acceptable here)
         loc = Location(*location)