fixed "import seafevets" when events disabled

handlers.py

@@ -1,42 +1,53 @@
-import seafevents
+import settings
-from utils import get_seafevents_session
 
-def repo_created_cb(sender, **kwargs):
+if not hasattr(settings, 'EVENTS_CONFIG_FILE'):
-    creator = kwargs['creator']
+    def repo_created_cb(sender, **kwargs):
-    repo_id = kwargs['repo_id']
+        pass
-    repo_name = kwargs['repo_name']
 
-    detail = {
+    def repo_deleted_cb(sender, **kwargs):
-        'creator': creator,
+        pass
-        'repo_id': repo_id,
+else:        
-        'repo_name': repo_name,
-    }
 
-    users = [creator]
+    import seafevents
+    from utils import get_seafevents_session
 
-    session = get_seafevents_session()
+    def repo_created_cb(sender, **kwargs):
-    seafevents.save_user_events (session, 'repo-create', detail, users, None)
+        creator = kwargs['creator']
-    session.close()
+        repo_id = kwargs['repo_id']
+        repo_name = kwargs['repo_name']
 
-def repo_deleted_cb(sender, **kwargs):
+        detail = {
-    """When a repo is deleted, an event would be added to every user in all
+            'creator': creator,
-    groups to which this repo is shared.
+            'repo_id': repo_id,
+            'repo_name': repo_name,
+        }
 
-    """
+        users = [creator]
-    usernames = kwargs['usernames']
-    
-    repo_owner = kwargs['repo_owner']
-    repo_id = kwargs['repo_id']
-    repo_name = kwargs['repo_name']
 
-    detail = {
+        session = get_seafevents_session()
-        'repo_owner': repo_owner,
+        seafevents.save_user_events (session, 'repo-create', detail, users, None)
-        'repo_id': repo_id,
+        session.close()
-        'repo_name': repo_name,
-    }
 
-    users = usernames
+    def repo_deleted_cb(sender, **kwargs):
+        """When a repo is deleted, an event would be added to every user in all
+        groups to which this repo is shared.
+
+        """
+        usernames = kwargs['usernames']
+
+        repo_owner = kwargs['repo_owner']
+        repo_id = kwargs['repo_id']
+        repo_name = kwargs['repo_name']
+
+        detail = {
+            'repo_owner': repo_owner,
+            'repo_id': repo_id,
+            'repo_name': repo_name,
+        }
+
+        users = usernames
+
+        session = get_seafevents_session()
+        seafevents.save_user_events (session, 'repo-delete', detail, users, None)
+        session.close()
 
-    session = get_seafevents_session()
-    seafevents.save_user_events (session, 'repo-delete', detail, users, None)
-    session.close()

utils.py

@@ -13,8 +13,6 @@ from base.models import FileContributors
 
 from pysearpc import SearpcError
 
-import seafevents
-
 from seaserv import seafserv_rpc, ccnet_threaded_rpc, seafserv_threaded_rpc, \
     get_repo, get_commits, get_group_repoids, CCNET_SERVER_ADDR, \
     CCNET_SERVER_PORT, get_org_id_by_repo_id, get_org_by_id, is_org_staff, \
@@ -410,11 +408,11 @@ def get_file_contributors(repo_id, file_path, file_path_hash, file_id):
 
     return contributors, last_modified 
 
-seafevents_session = None
+
-def get_seafevents_session():
+if hasattr(settings, 'EVENTS_CONFIG_FILE'):
-    if not hasattr(settings, 'EVENTS_CONFIG_FILE'):
+    import seafevents
-        return None
+    seafevents_session = None
-    else:
+    def get_seafevents_session():
         global seafevents_session
 
         if not seafevents_session:

views.py

@@ -76,11 +76,10 @@ from settings import FILE_PREVIEW_MAX_SIZE, INIT_PASSWD
 
 try:
     from settings import EVENTS_CONFIG_FILE
+    from utils import get_seafevents_session
     import seafevents
 except ImportError:
     EVENTS_CONFIG_FILE = None
-else:
-    from utils import get_seafevents_session
 
 @login_required
 def root(request):