format and lint orm

services/auth/roles.py

@@ -1,35 +1,33 @@
-
 import asyncio
 from sqlalchemy.orm import selectinload
 from orm.rbac import Role
 
+
 class RoleStorage:
-	roles = {}
-	lock = asyncio.Lock()
+    roles = {}
+    lock = asyncio.Lock()
 
-	@staticmethod
-	def init(session):
-		self = RoleStorage
-		roles = session.query(Role).\
-			options(selectinload(Role.permissions)).all()
-		self.roles = dict([(role.id, role) for role in roles])
-		print('[auth.roles] %d precached' % len(roles))
-		
+    @staticmethod
+    def init(session):
+        self = RoleStorage
+        roles = session.query(Role).options(selectinload(Role.permissions)).all()
+        self.roles = dict([(role.id, role) for role in roles])
+        print("[auth.roles] %d precached" % len(roles))
 
-	@staticmethod
-	async def get_role(id):
-		self = RoleStorage
-		async with self.lock:
-			return self.roles.get(id)
+    @staticmethod
+    async def get_role(id):
+        self = RoleStorage
+        async with self.lock:
+            return self.roles.get(id)
 
-	@staticmethod
-	async def add_role(role):
-		self = RoleStorage
-		async with self.lock:
-			self.roles[id] = role
+    @staticmethod
+    async def add_role(role):
+        self = RoleStorage
+        async with self.lock:
+            self.roles[id] = role
 
-	@staticmethod
-	async def del_role(id):
-		self = RoleStorage
-		async with self.lock:
-			del self.roles[id]
+    @staticmethod
+    async def del_role(id):
+        self = RoleStorage
+        async with self.lock:
+            del self.roles[id]

services/auth/users.py

@@ -4,47 +4,50 @@ from orm.user import User
 
 
 class UserStorage:
-	users = {}
-	lock = asyncio.Lock()
+    users = {}
+    lock = asyncio.Lock()
 
-	@staticmethod
-	def init(session):
-		self = UserStorage
-		users = session.query(User).\
-			options(selectinload(User.roles), selectinload(User.ratings)).all()
-		self.users = dict([(user.id, user) for user in users])
-		print('[auth.users] %d precached' % len(self.users))
+    @staticmethod
+    def init(session):
+        self = UserStorage
+        users = (
+            session.query(User)
+            .options(selectinload(User.roles), selectinload(User.ratings))
+            .all()
+        )
+        self.users = dict([(user.id, user) for user in users])
+        print("[auth.users] %d precached" % len(self.users))
 
-	@staticmethod
-	async def get_user(id):
-		self = UserStorage
-		async with self.lock:
-			return self.users.get(id)
+    @staticmethod
+    async def get_user(id):
+        self = UserStorage
+        async with self.lock:
+            return self.users.get(id)
 
-	@staticmethod
-	async def get_all_users():
-		self = UserStorage
-		async with self.lock:
-			aaa = list(self.users.values())
-			aaa.sort(key=lambda user: user.createdAt)
-			return aaa
+    @staticmethod
+    async def get_all_users():
+        self = UserStorage
+        async with self.lock:
+            aaa = list(self.users.values())
+            aaa.sort(key=lambda user: user.createdAt)
+            return aaa
 
-	@staticmethod
-	async def get_user_by_slug(slug):
-		self = UserStorage
-		async with self.lock:
-			for user in self.users.values():
-				if user.slug == slug:
-					return user
+    @staticmethod
+    async def get_user_by_slug(slug):
+        self = UserStorage
+        async with self.lock:
+            for user in self.users.values():
+                if user.slug == slug:
+                    return user
 
-	@staticmethod
-	async def add_user(user):
-		self = UserStorage
-		async with self.lock:
-			self.users[user.id] = user
+    @staticmethod
+    async def add_user(user):
+        self = UserStorage
+        async with self.lock:
+            self.users[user.id] = user
 
-	@staticmethod
-	async def del_user(id):
-		self = UserStorage
-		async with self.lock:
-			del self.users[id]
+    @staticmethod
+    async def del_user(id):
+        self = UserStorage
+        async with self.lock:
+            del self.users[id]