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

upgrade app compatibility with python:3.9 #104

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions flask/notejam/__init__.py
@@ -1,7 +1,7 @@
from flask import Flask
from flask.ext.sqlalchemy import SQLAlchemy
from flask.ext.login import LoginManager
from flask.ext.mail import Mail
from flask_sqlalchemy import SQLAlchemy
from flask_login import LoginManager
from flask_mail import Mail
from notejam.config import (
Config,
DevelopmentConfig,
Expand Down
5 changes: 3 additions & 2 deletions flask/notejam/forms.py
@@ -1,6 +1,7 @@
from flask.ext.wtf import (Form, TextField, PasswordField,
from flask_wtf import (Form)
from wtforms import (TextField, PasswordField,
SelectField, TextAreaField)
from flask.ext.wtf import Required, Email, EqualTo, ValidationError
from wtforms.validators import Required, Email, EqualTo, ValidationError

from notejam.models import User, Pad

Expand Down
2 changes: 1 addition & 1 deletion flask/notejam/models.py
Expand Up @@ -2,7 +2,7 @@

from werkzeug.security import (generate_password_hash,
check_password_hash)
from flask.ext.login import UserMixin
from flask_login import UserMixin

from notejam import db

Expand Down
2 changes: 1 addition & 1 deletion flask/notejam/templates/base.html
Expand Up @@ -35,7 +35,7 @@
<div class="container">
<div class="sixteen columns">
<div class="sign-in-out-block">
{% if current_user.is_authenticated() %}
{% if current_user.is_authenticated %}
{{ current_user.email}}:&nbsp; <a href="{{ url_for('account_settings') }}">Account settings</a>&nbsp;&nbsp;&nbsp;<a href="{{ url_for('signout') }}">Sign out</a>
{% else %}
<a href="{{ url_for('signup') }}">Sign up</a>&nbsp;&nbsp;&nbsp;<a href="{{ url_for('signin') }}">Sign in</a>
Expand Down
8 changes: 4 additions & 4 deletions flask/notejam/views.py
@@ -1,10 +1,10 @@
from datetime import date
import md5
from hashlib import md5

from flask import render_template, flash, request, redirect, url_for, abort
from flask.ext.login import (login_user, login_required, logout_user,
from flask_login import (login_user, login_required, logout_user,
current_user)
from flask.ext.mail import Message
from flask_mail import Message

from notejam import app, db, login_manager, mail
from notejam.models import User, Note, Pad
Expand Down Expand Up @@ -211,7 +211,7 @@ def forgot_password():
@app.context_processor
def inject_user_pads():
''' inject list of user pads in template context '''
if not current_user.is_anonymous():
if not current_user.is_anonymous:
return dict(pads=current_user.pads.all())
return dict(pads=[])

Expand Down
19 changes: 9 additions & 10 deletions flask/requirements.txt
@@ -1,16 +1,15 @@
Flask==0.9
Flask-Login==0.1.3
Flask-Mail==0.7.6
Flask-SQLAlchemy==0.16
Flask==1.1.2
Flask-Login==0.5
Flask-Mail==0.9.1
Flask-SQLAlchemy==2.5.1
Flask-Testing==0.4.2
Flask-WTF==0.8.3
Jinja2==2.6
SQLAlchemy==0.8.0
Flask-WTF==0.14.2
Jinja2==3.0.0
SQLAlchemy==1.4.15
Tempita==0.5.1
WTForms==1.0.3
Werkzeug==0.8.3
WTForms==2.1
Werkzeug==0.16.1
blinker==1.2
decorator==3.4.0
ipython==0.13.1
sqlalchemy-migrate==0.7.2
wsgiref==0.1.2