systematic use of from __future__ import absolute_import. it eliminates import NAME confusion with very common names (eg. import ldap is very ambiguous: can be a ldap module from realms-wiki, a ldap module from flask-ldap-login, or python-ldap module.

also cleant up a bit the import towards PEP8: builtin modules first, then 3rd party python packages, then local packages
This commit is contained in:
stef 2016-08-20 00:48:00 +02:00 committed by Stephane Martin
parent 2919be6b87
commit 2731531768
38 changed files with 156 additions and 42 deletions

View file

@ -1,3 +1,5 @@
from __future__ import absolute_import
from ..models import Auth
Auth.register('ldap')

View file

@ -1,7 +1,9 @@
from __future__ import absolute_import
from flask_wtf import Form
from wtforms import StringField, PasswordField, validators
class LoginForm(Form):
login = StringField('Username', [validators.DataRequired()])
password = PasswordField('Password', [validators.DataRequired()])
password = PasswordField('Password', [validators.DataRequired()])

View file

@ -1,7 +1,10 @@
from __future__ import absolute_import
from flask import render_template
from flask_login import login_user
from realms import ldap
from flask_ldap_login import LDAPLoginForm
from realms import ldap
from ..models import BaseUser

View file

@ -1,7 +1,15 @@
<<<<<<< HEAD
from flask import current_app, request, redirect, Blueprint, flash, url_for, session
from ..ldap.models import User
=======
from __future__ import absolute_import
from flask import current_app, request, redirect, Blueprint, flash, url_for
>>>>>>> systematic use of `from __future__ import absolute_import`. it eliminates `import NAME` confusion with very common names (eg. `import ldap` is very ambiguous: can be a ldap module from realms-wiki, a ldap module from flask-ldap-login, or `python-ldap` module.
from flask_ldap_login import LDAPLoginForm
from .models import User
blueprint = Blueprint('auth.ldap', __name__)