From c9b8fbfcbab7b3b05f032f69977058ac42f6b7a0 Mon Sep 17 00:00:00 2001 From: Stephane Martin Date: Mon, 5 Sep 2016 09:37:59 +0200 Subject: [PATCH] merge last conflict --- realms/commands.py | 2 ++ realms/modules/auth/ldap/views.py | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/realms/commands.py b/realms/commands.py index b6dc8ae..1440872 100644 --- a/realms/commands.py +++ b/realms/commands.py @@ -14,8 +14,10 @@ import pip from realms import config, create_app, db, __version__, cli, cache from realms.lib.util import random_string, in_virtualenv, green, yellow, red + config = config.conf + # called to discover commands in modules app = create_app() diff --git a/realms/modules/auth/ldap/views.py b/realms/modules/auth/ldap/views.py index 3cdf16e..d491aa8 100644 --- a/realms/modules/auth/ldap/views.py +++ b/realms/modules/auth/ldap/views.py @@ -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 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 import current_app, request, redirect, Blueprint, flash, url_for, session from flask_ldap_login import LDAPLoginForm from .models import User + blueprint = Blueprint('auth.ldap', __name__)