fix flask-wtf and beautifulsoup warnings

sopy/admin/forms.py

@@ -1,11 +1,11 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms.validators import ValidationError, InputRequired
 from sopy import db
 from sopy.auth.models import User
 from sopy.ext.forms import StripStringField
 
 
-class UserListForm(Form):
+class UserListForm(FlaskForm):
     user_ids = StripStringField('User IDs', validators=[InputRequired()])
 
     def validate_user_ids(self, field):

sopy/auth/forms.py

@@ -1,10 +1,10 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms.validators import InputRequired
 from sopy.auth.models import User
 from sopy.ext.forms import StripStringField
 
 
-class LoginForm(Form):
+class LoginForm(FlaskForm):
     user_id = StripStringField('User ID', validators=[InputRequired()])
 
     def validate_user_id(self, field):

sopy/canon/forms.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import Form as BaseForm
 from wtforms.fields import TextAreaField
 from wtforms.fields.core import BooleanField
@@ -12,7 +12,7 @@
 from sopy.tags.models import Tag
 
 
-class CanonItemForm(Form):
+class CanonItemForm(FlaskForm):
     title = StripStringField(validators=[InputRequired()])
     excerpt = TextAreaField()
     body = TextAreaField()

sopy/canon/views.py

@@ -1,5 +1,5 @@
 from flask import redirect, render_template
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from sopy import db
 from sopy.auth.login import group_required, current_user, login_required, require_group, has_group
 from sopy.canon import bp
@@ -53,7 +53,7 @@ def update(id=None):
 @group_required('editor')
 def delete(id):
     item = CanonItem.query.get_or_404(id)
-    form = Form()
+    form = FlaskForm()
 
     if form.validate_on_submit():
         db.session.delete(item)

sopy/salad/forms.py

@@ -1,8 +1,8 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms.validators import InputRequired
 from sopy.ext.forms import StripStringField
 
 
-class SaladForm(Form):
+class SaladForm(FlaskForm):
     term = StripStringField(validators=[InputRequired()])
     definition = StripStringField(validators=[InputRequired()])

sopy/salad/views.py

@@ -1,5 +1,5 @@
 from flask import request, render_template
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from sopy import db
 from sopy.auth.login import group_required, current_user
 from sopy.ext.views import redirect_for
@@ -58,7 +58,7 @@ def move(id, down=False):
 @group_required('Dark Council')
 def delete(id):
     item = Salad.query.get_or_404(id)
-    form = Form()
+    form = FlaskForm()
 
     if form.validate_on_submit():
         item.delete()

sopy/spoiler/forms.py

@@ -1,6 +1,6 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from wtforms import TextAreaField
 from wtforms.validators import InputRequired
 
-class SpoilerForm(Form):
+class SpoilerForm(FlaskForm):
     message = TextAreaField(validators=[InputRequired()])

sopy/transcript/forms.py

@@ -1,12 +1,12 @@
 from datetime import datetime
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from requests import RequestException
 from wtforms.fields import StringField, DateTimeField, TextAreaField, IntegerField
 from wtforms.validators import Optional, InputRequired
 from sopy.transcript.parser import get_range
 
 
-class CreateTranscriptForm(Form):
+class CreateTranscriptForm(FlaskForm):
     title = StringField(validators=[InputRequired()])
     ts = DateTimeField('When', format='%Y-%m-%d %H:%M', validators=[Optional()])
     body = TextAreaField('Description')
@@ -56,7 +56,7 @@ def populate_obj(self, obj):
             obj.ts = self.messages[0].ts
 
 
-class UpdateTranscriptForm(Form):
+class UpdateTranscriptForm(FlaskForm):
     title = StringField(validators=[InputRequired()])
     ts = DateTimeField('When', format='%Y-%m-%d %H:%M', validators=[Optional()])
     body = TextAreaField('Description')

sopy/transcript/parser.py

@@ -39,7 +39,7 @@ def previous_page(current):
     # get and parse the new page
     r = requests.get(base_url.format(element['href']))
     r.raise_for_status()
-    return BeautifulSoup(r.content)
+    return BeautifulSoup(r.content, 'lxml')
 
 
 def next_page(current):
@@ -74,7 +74,7 @@ def next_page(current):
     # get and parse the new page
     r = requests.get(base_url.format(element['href']))
     r.raise_for_status()
-    return BeautifulSoup(r.content)
+    return BeautifulSoup(r.content, 'lxml')
 
 
 def page_date(page):
@@ -101,11 +101,11 @@ def get_range(start_id, end_id):
     # need to check that the range is in the same room, so fetch start and end pages
     r = requests.get(permalink_url.format(start_id))
     r.raise_for_status()
-    page = BeautifulSoup(r.content)
+    page = BeautifulSoup(r.content, 'lxml')
     room_href = page.find('div', id='sidebar-content').find('span', class_='room-name').a['href']
     r = requests.get(permalink_url.format(end_id))
     r.raise_for_status()
-    end_page = BeautifulSoup(r.content)
+    end_page = BeautifulSoup(r.content, 'lxml')
 
     if room_href != end_page.find('div', id='sidebar-content').find('span', class_='room-name').a['href']:
         raise ValueError('Start and end are in different rooms.')

sopy/transcript/views.py

@@ -1,5 +1,5 @@
 from flask import render_template, redirect
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 from sopy import db
 from sopy.auth.login import group_required
 from sopy.ext.views import redirect_for
@@ -45,7 +45,7 @@ def update(id=None):
 @group_required('Dark Council')
 def delete(id):
     item = Transcript.query.get_or_404(id)
-    form = Form()
+    form = FlaskForm()
 
     if form.validate_on_submit():
         db.session.delete(item)

sopy/wiki/forms.py

@@ -1,4 +1,4 @@
-from flask_wtf import Form
+from flask_wtf import FlaskForm
 import re
 from markupsafe import Markup
 from wtforms.fields import TextAreaField, BooleanField
@@ -7,7 +7,7 @@
 from sopy.wiki.models import WikiPage
 
 
-class WikiPageForm(Form):
+class WikiPageForm(FlaskForm):
     title = StripStringField(validators=[DataRequired()])
     body = TextAreaField()
 

sopy/wiki/views.py

@@ -1,5 +1,5 @@
-from flask import redirect, render_template, request, session, url_for
-from flask_wtf import Form
+from flask import redirect, render_template, request, session
+from flask_wtf import FlaskForm
 from sopy import db
 from sopy.auth.login import group_required, current_user, login_required, require_group, has_group
 from sopy.ext.views import redirect_for
@@ -72,7 +72,7 @@ def update(title=None):
 @group_required('editor')
 def delete(title):
     page = WikiPage.query.filter(WikiPage.title == title).first_or_404()
-    form = Form()
+    form = FlaskForm()
 
     if form.validate_on_submit():
         db.session.delete(page)