소스 검색

Cleans up following PEP8 rules

Adrien Panay 7 년 전
부모
커밋
5bfc1f46c9
1개의 변경된 파일27개의 추가작업 그리고 27개의 파일을 삭제
  1. 27 27
      tracim/tracim/model/auth.py

+ 27 - 27
tracim/tracim/model/auth.py 파일 보기

6
 
6
 
7
 It's perfectly fine to re-use this definition in the tracim application,
7
 It's perfectly fine to re-use this definition in the tracim application,
8
 though.
8
 though.
9
-
10
 """
9
 """
10
+import os
11
+import time
11
 import uuid
12
 import uuid
12
 
13
 
13
-import os
14
 from datetime import datetime
14
 from datetime import datetime
15
-import time
16
-from hashlib import sha256
17
-from sqlalchemy.ext.hybrid import hybrid_property
18
-from tracim.lib.utils import lazy_ugettext as l_
19
 from hashlib import md5
15
 from hashlib import md5
20
-
21
-__all__ = ['User', 'Group', 'Permission']
16
+from hashlib import sha256
22
 
17
 
23
 from sqlalchemy import Column
18
 from sqlalchemy import Column
24
 from sqlalchemy import ForeignKey
19
 from sqlalchemy import ForeignKey
25
 from sqlalchemy import Sequence
20
 from sqlalchemy import Sequence
26
 from sqlalchemy import Table
21
 from sqlalchemy import Table
27
-
28
-from sqlalchemy.types import Unicode
29
-from sqlalchemy.types import Integer
30
-from sqlalchemy.types import DateTime
22
+from sqlalchemy.ext.hybrid import hybrid_property
23
+from sqlalchemy.orm import relation
24
+from sqlalchemy.orm import relationship
25
+from sqlalchemy.orm import synonym
31
 from sqlalchemy.types import Boolean
26
 from sqlalchemy.types import Boolean
32
-from sqlalchemy.orm import relation, relationship, synonym
33
-from tg import request
34
-from tracim.model import DeclarativeBase, metadata, DBSession
27
+from sqlalchemy.types import DateTime
28
+from sqlalchemy.types import Integer
29
+from sqlalchemy.types import Unicode
30
+
31
+from tracim.lib.utils import lazy_ugettext as l_
32
+from tracim.model import DBSession
33
+from tracim.model import DeclarativeBase
34
+from tracim.model import metadata
35
+
36
+__all__ = ['User', 'Group', 'Permission']
35
 
37
 
36
 # This is the association table for the many-to-many relationship between
38
 # This is the association table for the many-to-many relationship between
37
 # groups and permissions.
39
 # groups and permissions.
51
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
53
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
52
 )
54
 )
53
 
55
 
56
+
54
 class Group(DeclarativeBase):
57
 class Group(DeclarativeBase):
55
 
58
 
56
     TIM_NOBODY = 0
59
     TIM_NOBODY = 0
84
         return DBSession.query(cls).filter_by(group_name=group_name).first()
87
         return DBSession.query(cls).filter_by(group_name=group_name).first()
85
 
88
 
86
 
89
 
87
-
88
 class Profile(object):
90
 class Profile(object):
89
-    """ This model is the "max" group associated to a given user
90
-    """
91
+    """This model is the "max" group associated to a given user."""
91
 
92
 
92
     _NAME = [Group.TIM_NOBODY_GROUPNAME,
93
     _NAME = [Group.TIM_NOBODY_GROUPNAME,
93
              Group.TIM_USER_GROUPNAME,
94
              Group.TIM_USER_GROUPNAME,
106
         self.label = Profile._LABEL[profile_id]
107
         self.label = Profile._LABEL[profile_id]
107
 
108
 
108
 
109
 
109
-
110
 class User(DeclarativeBase):
110
 class User(DeclarativeBase):
111
     """
111
     """
112
     User definition.
112
     User definition.
113
 
113
 
114
     This is the user definition used by :mod:`repoze.who`, which requires at
114
     This is the user definition used by :mod:`repoze.who`, which requires at
115
     least the ``email`` column.
115
     least the ``email`` column.
116
-
117
     """
116
     """
117
+
118
     __tablename__ = 'users'
118
     __tablename__ = 'users'
119
 
119
 
120
     user_id = Column(Integer, Sequence('seq__users__user_id'), autoincrement=True, primary_key=True)
120
     user_id = Column(Integer, Sequence('seq__users__user_id'), autoincrement=True, primary_key=True)
151
     @property
151
     @property
152
     def profile(self) -> Profile:
152
     def profile(self) -> Profile:
153
         profile_id = 0
153
         profile_id = 0
154
-        if len(self.groups)>0:
154
+        if len(self.groups) > 0:
155
             profile_id = max(group.group_id for group in self.groups)
155
             profile_id = max(group.group_id for group in self.groups)
156
         return Profile(profile_id)
156
         return Profile(profile_id)
157
 
157
 
223
 
223
 
224
     webdav_left_digest_response_hash = synonym('_webdav_left_digest_response_hash',
224
     webdav_left_digest_response_hash = synonym('_webdav_left_digest_response_hash',
225
                                                descriptor=property(_get_hash_digest,
225
                                                descriptor=property(_get_hash_digest,
226
-                                                                    _set_hash_digest))
226
+                                                                   _set_hash_digest))
227
 
227
 
228
     def update_webdav_digest_auth(self, cleartext_password) -> None:
228
     def update_webdav_digest_auth(self, cleartext_password) -> None:
229
         self.webdav_left_digest_response_hash \
229
         self.webdav_left_digest_response_hash \
232
                 cleartext_password=cleartext_password,
232
                 cleartext_password=cleartext_password,
233
             )
233
             )
234
 
234
 
235
-
236
     def validate_password(self, cleartext_password):
235
     def validate_password(self, cleartext_password):
237
         """
236
         """
238
         Check the password against existing credentials.
237
         Check the password against existing credentials.
256
 
255
 
257
     def get_display_name(self, remove_email_part=False):
256
     def get_display_name(self, remove_email_part=False):
258
         """
257
         """
258
+        Get a name to display from corresponding member or email.
259
+
259
         :param remove_email_part: If True and display name based on email,
260
         :param remove_email_part: If True and display name based on email,
260
-         remove @xxx.xxx part of email in returned value
261
+            remove @xxx.xxx part of email in returned value
261
         :return: display name based on user name or email.
262
         :return: display name based on user name or email.
262
         """
263
         """
263
-        if self.display_name != None and self.display_name != '':
264
+        if self.display_name:
264
             return self.display_name
265
             return self.display_name
265
         else:
266
         else:
266
             if remove_email_part:
267
             if remove_email_part:
279
     def ensure_auth_token(self) -> None:
280
     def ensure_auth_token(self) -> None:
280
         """
281
         """
281
         Create auth_token if None, regenerate auth_token if too much old.
282
         Create auth_token if None, regenerate auth_token if too much old.
283
+
282
         auth_token validity is set in
284
         auth_token validity is set in
283
         :return:
285
         :return:
284
         """
286
         """
311
 
313
 
312
     __tablename__ = 'permissions'
314
     __tablename__ = 'permissions'
313
 
315
 
314
-
315
     permission_id = Column(Integer, Sequence('seq__permissions__permission_id'), autoincrement=True, primary_key=True)
316
     permission_id = Column(Integer, Sequence('seq__permissions__permission_id'), autoincrement=True, primary_key=True)
316
     permission_name = Column(Unicode(63), unique=True, nullable=False)
317
     permission_name = Column(Unicode(63), unique=True, nullable=False)
317
     description = Column(Unicode(255))
318
     description = Column(Unicode(255))
324
 
325
 
325
     def __unicode__(self):
326
     def __unicode__(self):
326
         return self.permission_name
327
         return self.permission_name
327
-