Skip to content
Snippets Groups Projects
Verified Commit aa0ba6dd authored by sistason's avatar sistason
Browse files

change init import to better compatible with the rest of the code

parent 6fda43a0
No related branches found
No related tags found
No related merge requests found
...@@ -153,7 +153,7 @@ class TestUserViews(UffdTestCase): ...@@ -153,7 +153,7 @@ class TestUserViews(UffdTestCase):
self.assertEqual(_user.mail, 'newuser@example.com') self.assertEqual(_user.mail, 'newuser@example.com')
self.assertEqual(_user.uid, user.uid) self.assertEqual(_user.uid, user.uid)
self.assertEqual(_user.loginname, user.loginname) self.assertEqual(_user.loginname, user.loginname)
self.assertTrue(ldap.test_user_bind(_user.dn, 'userpassword')) self.assertTrue(ldap.test_user_bind(user.dn, 'userpassword'))
self.assertEqual(roles, ['base', 'role1']) self.assertEqual(roles, ['base', 'role1'])
def test_update_password(self): def test_update_password(self):
......
...@@ -15,7 +15,7 @@ def dump(basename, resp): ...@@ -15,7 +15,7 @@ def dump(basename, resp):
return return
os.makedirs(root, exist_ok=True) os.makedirs(root, exist_ok=True)
path = os.path.join(root, basename+suffix) path = os.path.join(root, basename+suffix)
with open(path, 'xb') as f: with open(path, 'wb') as f:
f.write(resp.data) f.write(resp.data)
def db_flush(): def db_flush():
......
...@@ -12,7 +12,7 @@ sys.path.append('deps/ldapalchemy') ...@@ -12,7 +12,7 @@ sys.path.append('deps/ldapalchemy')
# pylint: disable=wrong-import-position # pylint: disable=wrong-import-position
from uffd.database import db, SQLAlchemyJSON from uffd.database import db, SQLAlchemyJSON
from uffd.ldap import ldap import uffd.ldap
from uffd.template_helper import register_template_helper from uffd.template_helper import register_template_helper
from uffd.navbar import setup_navbar from uffd.navbar import setup_navbar
# pylint: enable=wrong-import-position # pylint: enable=wrong-import-position
...@@ -67,7 +67,7 @@ def create_app(test_config=None): # pylint: disable=too-many-locals ...@@ -67,7 +67,7 @@ def create_app(test_config=None): # pylint: disable=too-many-locals
@app.shell_context_processor @app.shell_context_processor
def push_request_context(): #pylint: disable=unused-variable def push_request_context(): #pylint: disable=unused-variable
app.test_request_context().push() # LDAP ORM requires request context app.test_request_context().push() # LDAP ORM requires request context
return {'db': db, 'ldap': ldap} return {'db': db, 'ldap': uffd.ldap.ldap}
@app.route("/") @app.route("/")
def index(): #pylint: disable=unused-variable def index(): #pylint: disable=unused-variable
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment