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

Fixes #456 Add Image/Video search support for Bing #448

Merged
merged 13 commits into from
Jan 26, 2018
Merged

Fixes #456 Add Image/Video search support for Bing #448

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
946781a
Addresses #320 and #321 Add Image/Video search support for Bing
bhaveshAn Jan 19, 2018
4cda2e0
Resolve conflicts
bhaveshAn Jan 21, 2018
42a36ce
Merge remote-tracking branch 'upsteam/master' into bing
bhaveshAn Jan 22, 2018
e54dbbb
Add staticmethod decorator
bhaveshAn Jan 22, 2018
978015d
Add staticmethod decorator
bhaveshAn Jan 22, 2018
5c009be
Add staticmethod decorator
bhaveshAn Jan 22, 2018
15ba9b3
Add staticmethod decorator
bhaveshAn Jan 22, 2018
da47877
Resolved conflicts
bhaveshAn Jan 23, 2018
e16ebfe
Added tests
bhaveshAn Jan 23, 2018
81c3de7
Added tests
bhaveshAn Jan 23, 2018
da58033
Added tests
bhaveshAn Jan 23, 2018
8c9f058
Added tests
bhaveshAn Jan 23, 2018
26d8459
Added tests
bhaveshAn Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
render_template, request)

try:
from app.scrapers import feed_gen, scrapers
except ImportError:
from scrapers import feed_gen, scrapers
except Exception as e:
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems to be going in the wrong direction. From PEP8: "When catching exceptions, mention specific exceptions whenever possible". Also, why create an unused variable (e)? Linters will properly complain.

from app.scrapers import feed_gen, scrapers

DISABLE_CACHE = True # Temporarily disable the MongoDB cache
if DISABLE_CACHE:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.