From 0e867dd4e2855cd60b6e7d60256eebab842a9ad9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 07 2017 09:13:25 +0000
Subject: Style and tests fixes to make the unit-tests pass


---

diff --git a/alembic/versions/27a79ff0fb41_add_modify_project_acl.py b/alembic/versions/27a79ff0fb41_add_modify_project_acl.py
index 33fb2a6..9811339 100644
--- a/alembic/versions/27a79ff0fb41_add_modify_project_acl.py
+++ b/alembic/versions/27a79ff0fb41_add_modify_project_acl.py
@@ -13,7 +13,12 @@ down_revision = '5179e99d35a5'
 from alembic import op
 import sqlalchemy as sa
 
-from pagure.lib import model
+try:
+    from pagure.lib import model
+except ImportError:
+    import sys
+    sys.path.insert(0, '.')
+    from pagure.lib import model
 
 
 def get_session():
diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 482801b..c0a6313 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -42,7 +42,6 @@ from sqlalchemy import asc
 from sqlalchemy.orm import aliased
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import scoped_session
-from sqlalchemy.exc import SQLAlchemyError
 
 import pagure
 import pagure.exceptions
diff --git a/pagure/ui/app.py b/pagure/ui/app.py
index feab07c..6d5c779 100644
--- a/pagure/ui/app.py
+++ b/pagure/ui/app.py
@@ -590,7 +590,7 @@ def update_user_settings():
             message = pagure.lib.update_user_settings(
                 SESSION,
                 settings=settings,
-                user=flask.g.fas_user.username,
+                user=user.username,
             )
             SESSION.commit()
             flask.flash(message)
@@ -832,7 +832,7 @@ def add_api_user_token():
                 project=None,
                 description=form.description.data.strip() or None,
                 acls=form.acls.data,
-                username=flask.g.fas_user.username,
+                username=user.username,
             )
             SESSION.commit()
             flask.flash(msg)
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 2b289f0..4271b94 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -5360,6 +5360,7 @@ foo bar
                 'issue_update',
                 'issue_update_custom_fields',
                 'issue_update_milestone',
+                'modify_project',
                 'pull_request_close',
                 'pull_request_comment',
                 'pull_request_flag',