Skip to content

Commit

Permalink
Merge pull request #9 from iurisilvio/jsonp
Browse files Browse the repository at this point in the history
JSONP authentication support
  • Loading branch information
iurisilvio committed Dec 11, 2014
2 parents 08b0c73 + 8f2a564 commit 2a05922
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion flask_pusher.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import hashlib
import hmac

from flask import Blueprint, current_app, request, jsonify, abort
from flask import Blueprint, current_app, request, abort
try:
from flask.ext.jsonpify import jsonify
except ImportError:
from flask import jsonify

import pusher as _pusher

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
install_requires=[
'Flask',
'pusher',
'Flask-Jsonpify', # for jsonp auth support
],
test_suite="tests",
classifiers=[
Expand Down

0 comments on commit 2a05922

Please sign in to comment.