Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

py3-ignores.txt supports comments #1044

Merged
merged 2 commits into from Feb 10, 2015
Merged

py3-ignores.txt supports comments #1044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ea4a72
py3-ignores.txt supports comments
klangner Feb 9, 2015
a0299d9
fixed variable name
klangner Feb 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
@@ -1,3 +1,5 @@
/.vagrant
/scrapy.iml
*.pyc
_trial_temp*
dropin.cache
Expand Down
7 changes: 4 additions & 3 deletions conftest.py
View file
Open in desktop
Expand Up @@ -9,9 +9,10 @@
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'):
filePath = line.strip()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please rename filePath to file_path or filepath or path?

if len(filePath) > 0 and filePath[0] != '#':
collect_ignore.append(filePath)

class LogObservers:
"""Class for keeping track of log observers across test modules"""
Expand Down