Make inner package imports relative

app/admin/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 admin = Blueprint('admin', __name__)
-from . import views
+from . import views  # noqa

app/admin/forms.py

@@ -1,8 +1,8 @@
-from app.models import Role, User
 from flask_wtf import FlaskForm
 from wtforms import (BooleanField, SelectField, StringField, SubmitField,
                      ValidationError)
 from wtforms.validators import DataRequired, Email, Length, Regexp
+from ..models import Role, User
 
 
 class EditUserForm(FlaskForm):

app/admin/views.py

@@ -1,13 +1,13 @@
-from app import db
-from app.decorators import admin_required
-from app.models import Role, User
-from app.profile.background_functions import delete_user_
 from flask import current_app, flash, redirect, render_template, url_for
 from flask_login import login_required
 from threading import Thread
 from . import admin
 from .forms import EditUserForm
 from .tables import AdminUserItem, AdminUserTable
+from .. import db
+from ..decorators import admin_required
+from ..models import Role, User
+from ..profile.background_functions import delete_user_
 
 
 @admin.route('/')

app/auth/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 auth = Blueprint('auth', __name__)
-from . import views
+from . import views  # noqa

app/auth/forms.py

@@ -1,4 +1,4 @@
-from app.models import User
+from ..models import User
 from flask_wtf import FlaskForm
 from wtforms import (BooleanField, PasswordField, StringField, SubmitField,
                      ValidationError)

app/auth/views.py

@@ -1,12 +1,12 @@
-from app import db, logger
-from app.email import send_email
-from app.models import User
 from flask import (current_app, flash, redirect, render_template, request,
                    url_for)
 from flask_login import current_user, login_user, login_required, logout_user
 from . import auth
 from .forms import (LoginForm, ResetPasswordForm, ResetPasswordRequestForm,
                     RegistrationForm)
+from .. import db
+from ..email import send_email
+from ..models import User
 import os
 import shutil
 

app/corpora/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 corpora = Blueprint('corpora', __name__)
-from . import events, views
+from . import events, views  # noqa

app/corpora/background_functions.py

@@ -1,4 +1,4 @@
-from app.models import Corpus, CorpusFile
+from ..models import Corpus, CorpusFile
 
 
 def delete_corpus_(app, corpus_id):

app/corpora/events.py

@@ -1,10 +1,10 @@
-from app import db, logger, socketio
-from app.decorators import socketio_login_required
-from app.events import connected_sessions
-from app.models import Corpus, User
-from .cqi import CQiClient
 from flask import current_app, request
 from flask_login import current_user
+from .cqi import CQiClient
+from .. import db, logger, socketio
+from ..decorators import socketio_login_required
+from ..events import connected_sessions
+from ..models import Corpus, User
 import math
 
 

app/corpora/views.py

@@ -1,5 +1,3 @@
-from app import db, logger
-from app.models import Corpus, CorpusFile
 from flask import (abort, current_app, flash, redirect, request,
                    render_template, url_for, send_from_directory)
 from flask_login import current_user, login_required
@@ -10,6 +8,8 @@ from .background_functions import (delete_corpus_, delete_corpus_file_,
                                    edit_corpus_file_)
 from .forms import (AddCorpusFileForm, AddCorpusForm, EditCorpusFileForm,
                     QueryDownloadForm, QueryForm)
+from .. import db
+from ..models import Corpus, CorpusFile
 import os
 
 

app/decorators.py

@@ -1,7 +1,7 @@
-from functools import wraps
 from flask import abort
 from flask_login import current_user
 from flask_socketio import disconnect
+from functools import wraps
 from .models import Permission
 
 

app/email.py

@@ -1,6 +1,6 @@
-from threading import Thread
 from flask import current_app, render_template
 from flask_mail import Message
+from threading import Thread
 from . import mail
 
 

app/jobs/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 jobs = Blueprint('jobs', __name__)
-from . import views
+from . import views  # noqa

app/jobs/background_functions.py

@@ -1,4 +1,4 @@
-from app.models import Job
+from ..models import Job
 
 
 def delete_job_(app, job_id):

app/jobs/views.py

@@ -1,10 +1,10 @@
-from app.models import Job, JobInput, JobResult
 from flask import (abort, current_app, flash, redirect, render_template,
                    send_from_directory, url_for)
 from flask_login import current_user, login_required
 from threading import Thread
 from . import jobs
 from .background_functions import delete_job_
+from ..models import Job, JobInput, JobResult
 import os
 
 

app/main/__init__.py

@@ -2,10 +2,4 @@ from flask import Blueprint
 
 
 main = Blueprint('main', __name__)
-from . import errors, views
-from app.models import Permission
-
-
-@main.app_context_processor
-def inject_permissions():
-    return dict(Permission=Permission)
+from . import errors, views  # noqa

app/main/views.py

@@ -1,11 +1,10 @@
-from app import logger
-from app.auth.forms import LoginForm
-from app.models import User
 from flask import flash, redirect, render_template, url_for
 from flask_login import login_required, login_user
 from . import main
 from .forms import FeedbackForm
-
+from .. import logger
+from ..auth.forms import LoginForm
+from ..models import User
 
 @main.route('/', methods=['GET', 'POST'])
 def index():

app/profile/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 profile = Blueprint('profile', __name__)
-from . import views
+from . import views  # noqa

app/profile/background_functions.py

@@ -1,4 +1,4 @@
-from app.models import User
+from ..models import User
 
 
 def delete_user_(app, user_id):

app/profile/views.py

@@ -1,10 +1,10 @@
-from app import db
 from flask import current_app, flash, redirect, render_template, url_for
 from flask_login import current_user, login_required, logout_user
 from threading import Thread
 from . import profile
 from .background_functions import delete_user_
 from .forms import EditEmailForm, EditGeneralSettingsForm, EditPasswordForm
+from .. import db
 
 
 @profile.route('/settings', methods=['GET', 'POST'])

app/services/__init__.py

@@ -2,4 +2,4 @@ from flask import Blueprint
 
 
 services = Blueprint('services', __name__)
-from . import views
+from . import views  # noqa

app/services/views.py

@@ -1,14 +1,13 @@
-from app import db
-from app.jobs.forms import AddNLPJobForm, AddOCRJobForm, AddSetupFilesJobForm
-from app.models import Job, JobInput
 from flask import (abort, current_app, flash, make_response, render_template,
                    url_for)
 from flask_login import current_user, login_required
 from werkzeug.utils import secure_filename
 from . import services
+from .. import db
+from ..jobs.forms import AddNLPJobForm, AddOCRJobForm, AddSetupFilesJobForm
+from ..models import Job, JobInput
 import json
 import os
-from app import logger
 
 
 SERVICES = {'corpus_analysis': {'name': 'Corpus analysis'},

app/test/__init__.py

@@ -1,5 +0,0 @@
-from flask import Blueprint
-
-
-test = Blueprint('test', __name__)
-from . import events, views

app/test/events.py

@@ -1,23 +0,0 @@
-from app import logger, socketio
-from flask_login import login_required
-from werkzeug.datastructures import FileStorage
-from werkzeug.utils import secure_filename
-from .forms import TestForm
-import io
-
-
-@socketio.on('submit-test-form')
-@login_required
-def recv_test_form(data):
-    logger.warning("data_received")
-    filename = secure_filename(data['file-wrapper']['name'])
-    stream = io.BytesIO(data['file-wrapper']['bytes'])
-    file = FileStorage(filename=filename, stream=stream)
-    data['file'] = file
-    test_form = TestForm(data=data)
-    if test_form.validate():
-        socketio.emit('submit-test-form', {'msg': {},
-                                           'status': 201})
-    else:
-        socketio.emit('submit-test-form', {'msg': test_form.errors,
-                                           'status': 400})

app/test/forms.py

@@ -1,12 +0,0 @@
-from flask_wtf import FlaskForm
-from flask_wtf.file import FileAllowed, FileField, FileRequired
-from wtforms import StringField, SubmitField
-from wtforms.validators import DataRequired, Length
-
-
-class TestForm(FlaskForm):
-    description = StringField('Description',
-                              validators=[DataRequired(), Length(1, 255)])
-    file = FileField('File', validators=[FileAllowed(['txt'], 'Plain text only!'), FileRequired()])
-    submit = SubmitField()
-    title = StringField('Title', validators=[DataRequired(), Length(1, 32)])

app/test/views.py

@@ -1,12 +0,0 @@
-from flask import render_template
-from flask_login import login_required
-from . import test
-from .forms import TestForm
-
-
-@test.route('/')
-@login_required
-def index():
-    test_form = TestForm()
-    return render_template('test/index.html.j2', title='Test',
-                           test_form=test_form)