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

Fixed setup.py reading requirement strings as bytes() #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Merge branch 'master' into master
jamesjwarren authored Mar 11, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 03c2eeae577c61810dd44c3139a566252025f725
5 changes: 3 additions & 2 deletions flask_store/__init__.py
Original file line number Diff line number Diff line change
@@ -11,10 +11,11 @@
* Amazon Simple File Storage (requires ``boto`` to be installed)
"""

# Python 2/3 imports
try:
import urlparse
from urllib.parse import urlparse
except ImportError:
import urllib.parse as urlparse
from urlparse import urlparse

from flask import current_app, send_from_directory
from flask_store.exceptions import NotConfiguredError
You are viewing a condensed version of this merge commit. You can view the full changes here.