Python3support

flask/.gitignore

@@ -1,3 +1,4 @@
 *.pyc
 venv
 local_db
+.vscode

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,

flask/notejam/forms.py

@@ -1,16 +1,16 @@
-from flask.ext.wtf import (Form, TextField, PasswordField,
-SelectField, TextAreaField)
-from flask.ext.wtf import Required, Email, EqualTo, ValidationError
+from flask_wtf import FlaskForm
+from wtforms import TextField, PasswordField, SelectField, TextAreaField
+from wtforms.validators import Required, Email, EqualTo, ValidationError
 
 from notejam.models import User, Pad
 
 
-class SigninForm(Form):
+class SigninForm(FlaskForm):
     email = TextField('Email', validators=[Required(), Email()])
     password = PasswordField('Password', validators=[Required()])
 
 
-class SignupForm(Form):
+class SignupForm(FlaskForm):
     email = TextField('Email', validators=[Required(), Email()])
     password = PasswordField('Password', validators=[Required()])
     repeat_password = PasswordField(
@@ -29,7 +29,7 @@ def validate_email(self, field):
             )
 
 
-class NoteForm(Form):
+class NoteForm(FlaskForm):
     name = TextField('Name', validators=[Required()])
     text = TextAreaField('Note', validators=[Required()])
     pad = SelectField('Pad', choices=[], coerce=int)
@@ -42,16 +42,16 @@ def __init__(self, user=None, **kwargs):
         ]
 
 
-class PadForm(Form):
+class PadForm(FlaskForm):
     name = TextField('Name', validators=[Required()])
 
 
 # dummy form
-class DeleteForm(Form):
+class DeleteForm(FlaskForm):
     pass
 
 
-class ChangePasswordForm(Form):
+class ChangePasswordForm(FlaskForm):
     old_password = PasswordField('Old Password', validators=[Required()])
     new_password = PasswordField('New Password', validators=[Required()])
     repeat_new_password = PasswordField(
@@ -74,7 +74,7 @@ def validate_old_password(self, field):
             )
 
 
-class ForgotPasswordForm(Form):
+class ForgotPasswordForm(FlaskForm):
     email = TextField('Email', validators=[Required(), Email()])
 
     def validate_email(self, field):

flask/notejam/models.py

@@ -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
 

flask/notejam/templates/base.html

@@ -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>

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
@@ -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=[])
 
@@ -256,7 +256,7 @@ def _get_order_by(param='-updated_at'):
 
 def _generate_password(user):
     ''' generate new user password '''
-    m = md5.new()
+    m = md5()
     m.update(
         "{email}{secret}{date}".format(
             email=user.email,

flask/requirements.txt

@@ -1,16 +1,15 @@
-Flask==0.9
-Flask-Login==0.1.3
+Flask==1.1
+Flask-Login==0.4.1
 Flask-Mail==0.7.6
-Flask-SQLAlchemy==0.16
+Flask-SQLAlchemy==2.4.1
 Flask-Testing==0.4.2
-Flask-WTF==0.8.3
-Jinja2==2.6
-SQLAlchemy==0.8.0
+Flask-WTF==0.14.2
+Jinja2==2.10.1
+SQLAlchemy==1.3.12
 Tempita==0.5.1
-WTForms==1.0.3
-Werkzeug==0.8.3
+WTForms==2.2.1
+Werkzeug==0.16
 blinker==1.2
 decorator==3.4.0
 ipython==0.13.1
 sqlalchemy-migrate==0.7.2
-wsgiref==0.1.2