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.

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

Import Markup from MarkupSafe #9

Merged
merged 3 commits into from
Jun 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- 0.5.3
- Markup should be imported from MarkupSafe

- 0.5.2
- Project URL updated
- Use Travis CI for testing
Expand Down Expand Up @@ -28,4 +31,5 @@
- Make use of requests

- Version 0.1.0
- First version
- First version

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Flask-xCaptcha

[![Build Status](https://travis-ci.com/benjilev08/flask-xcaptcha.svg?branch=master)](https://travis-ci.com/benjilev08/flask-xcaptcha)
[![Build Status](https://app.travis-ci.com/bmaximuml/flask-xcaptcha.svg?branch=master)](https://app.travis-ci.com/bmaximuml/flask-xcaptcha)

The new xCaptcha implementation for Flask without Flask-WTF.

Expand Down Expand Up @@ -157,4 +157,4 @@ Returns a bool indicating whether or not the xCaptcha was successfully completed

This will insert an HTML div element containing the captcha into a Jinja2 template

(c) 2020 Max Levine
(c) 2022 Max Levine
11 changes: 7 additions & 4 deletions flask_xcaptcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
"""

__NAME__ = "Flask-xCaptcha"
__version__ = "0.5.2"
__version__ = "0.5.3"
__license__ = "MIT"
__author__ = "Max Levine"
__copyright__ = "(c) 2020 Max Levine"
__copyright__ = "(c) 2022 Max Levine"

try:
from flask import request
from jinja2 import Markup
try:
from jinja2 import Markup
except ImportError:
from markupsafe import Markup
import requests
except ImportError as ex:
except ImportError:
print("Missing dependencies")


Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
install_requires=[
"flask",
"requests"
"MarkupSafe"
],
keywords=['flask', 'recaptcha', 'hcaptcha', 'xcaptcha', "validate"],
platforms='any',
Expand Down