From 4b4f9404b10b291df292bdf0988404e5e73a3aa4 Mon Sep 17 00:00:00 2001
From: Pawel Solyga <Pawel.Solyga@gmail.com>
Date: Fri, 3 Apr 2009 17:29:36 +0000
Subject: [PATCH] Style fixes and removal of unused imports in soc.logic.models
 modules.

Patch by: Pawel Solyga
Reviewed by: to-be-reviewed
---
 app/soc/logic/models/group.py             |  1 -
 app/soc/logic/models/mentor.py            |  9 ++++++---
 app/soc/logic/models/presence_with_tos.py |  3 +--
 app/soc/logic/models/role.py              | 12 ++++++------
 app/soc/logic/models/site.py              |  1 -
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/soc/logic/models/group.py b/app/soc/logic/models/group.py
index f00e201c..d6a7fc9d 100644
--- a/app/soc/logic/models/group.py
+++ b/app/soc/logic/models/group.py
@@ -22,7 +22,6 @@ __authors__ = [
   ]
 
 
-from soc.cache import sidebar
 from soc.logic.models import base
 
 import soc.models.group
diff --git a/app/soc/logic/models/mentor.py b/app/soc/logic/models/mentor.py
index 8f35724c..4741dfe8 100644
--- a/app/soc/logic/models/mentor.py
+++ b/app/soc/logic/models/mentor.py
@@ -63,8 +63,10 @@ class Logic(role.Logic):
 
     """
 
-    from soc.logic.models.student_project import logic as student_project_logic
-    from soc.logic.models.student_proposal import logic as student_proposal_logic
+    from soc.logic.models.student_project import logic as \
+        student_project_logic
+    from soc.logic.models.student_proposal import logic as \
+        student_proposal_logic
 
     fields = {'mentor': entity}
 
@@ -88,7 +90,8 @@ class Logic(role.Logic):
       Proposals possible mentor lists.
     """
 
-    from soc.logic.models.student_proposal import logic as student_proposal_logic
+    from soc.logic.models.student_proposal import logic \
+        as student_proposal_logic
 
     value = entity_properties[name]
 
diff --git a/app/soc/logic/models/presence_with_tos.py b/app/soc/logic/models/presence_with_tos.py
index 7443891a..09cde668 100644
--- a/app/soc/logic/models/presence_with_tos.py
+++ b/app/soc/logic/models/presence_with_tos.py
@@ -23,7 +23,6 @@ __authors__ = [
 
 
 from soc.logic.models import presence
-from soc.logic.models import presence as presence_logic
 
 import soc.models.presence_with_tos
 
@@ -33,7 +32,7 @@ class Logic(presence.Logic):
   """
 
   def __init__(self, model=soc.models.presence_with_tos.PresenceWithToS,
-               base_model=None, scope_logic=presence_logic):
+               base_model=None, scope_logic=presence):
     """Defines the name, key_name and model for this entity.
     """
 
diff --git a/app/soc/logic/models/role.py b/app/soc/logic/models/role.py
index 242d563d..47766760 100644
--- a/app/soc/logic/models/role.py
+++ b/app/soc/logic/models/role.py
@@ -103,14 +103,14 @@ class Logic(base.Logic):
     """
 
     if self.disallow_last_resign:
-     # check if this is the last active role for it's scope
-     fields = {'scope': entity.scope,
+      # check if this is the last active role for it's scope
+      fields = {'scope': entity.scope,
           'status': 'active'}
-     roles = self.getForFields(fields, limit=2)
+      roles = self.getForFields(fields, limit=2)
 
-     # if this it the last one return error message
-     if len(roles) <= 1:
-       return DEF_LAST_RESIGN_ERROR_FMT
+      # if this it the last one return error message
+      if len(roles) <= 1:
+        return DEF_LAST_RESIGN_ERROR_FMT
 
     # resignation is possible
     return None
diff --git a/app/soc/logic/models/site.py b/app/soc/logic/models/site.py
index f7641389..20c01c7c 100644
--- a/app/soc/logic/models/site.py
+++ b/app/soc/logic/models/site.py
@@ -22,7 +22,6 @@ __authors__ = [
   ]
 
 
-from soc.cache import sidebar
 from soc.logic.models import presence_with_tos
 
 import soc.models.presence_with_tos
-- 
2.11.4.GIT