Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge last conflict

Browse source
This commit is contained in:
Stephane Martin 2016-09-05 09:37:59 +02:00
parent 0288038111
commit c9b8fbfcba
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
realms/commands.py
View file

@ -14,8 +14,10 @@ import pip
from realms import config, create_app, db, __version__, cli, cache from realms import config, create_app, db, __version__, cli, cache
from realms.lib.util import random_string, in_virtualenv, green, yellow, red from realms.lib.util import random_string, in_virtualenv, green, yellow, red
config = config.conf config = config.conf
# called to discover commands in modules # called to discover commands in modules
app = create_app() app = create_app()

8
realms/modules/auth/ldap/views.py
View file

@ -1,15 +1,11 @@
<<<<<<< HEAD
from flask import current_app, request, redirect, Blueprint, flash, url_for, session
from ..ldap.models import User
=======
from __future__ import absolute_import from __future__ import absolute_import
from flask import current_app, request, redirect, Blueprint, flash, url_for from flask import current_app, request, redirect, Blueprint, flash, url_for, session
>>>>>>> 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 flask_ldap_login import LDAPLoginForm
from .models import User from .models import User
blueprint = Blueprint('auth.ldap', __name__) blueprint = Blueprint('auth.ldap', __name__)