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

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aa36b8
Fixed setup.py reading requirement strings as bytes()
smackware Mar 8, 2020
6917494
Python3 compatibility fixes
smackware Mar 10, 2020
03c2eea
Merge branch 'master' into master
jamesjwarren Mar 11, 2020
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: 4 additions & 0 deletions flask_store/providers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

import os
import shortuuid
try:
import urlparse
except ImportError:
import urllib.parse as urlparse

from flask import current_app
from flask_store.utils import is_path, path_to_uri
Expand Down
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ def read_requirements(filename):
line = line.strip()
if not line or line.startswith(b'#') or line == '':
continue
requirements.append(line.decode('utf-8'))
if isinstance(line, bytes):
line = line.decode()
requirements.append(line)
except IOError:
warnings.warn('{0} was not found'.format(filename))

Expand Down