Merge pull request #1044 from klangner/master

py3-ignores.txt supports comments

.gitignore

@@ -1,3 +1,5 @@
+/.vagrant
+/scrapy.iml
 *.pyc
 _trial_temp*
 dropin.cache

conftest.py

@@ -9,9 +9,10 @@ if 'django' not in optional_features:
     collect_ignore.append("tests/test_djangoitem/models.py")
 
 if six.PY3:
-    for fn in open('tests/py3-ignores.txt'):
-        if fn.strip():
-            collect_ignore.append(fn.strip())
+    for line in open('tests/py3-ignores.txt'):
+        file_path = line.strip()
+        if len(file_path) > 0 and file_path[0] != '#':
+            collect_ignore.append(file_path)
 
 class LogObservers:
     """Class for keeping track of log observers across test modules"""