File tree 2 files changed +12
-15
lines changed
2 files changed +12
-15
lines changed Original file line number Diff line number Diff line change @@ -486,8 +486,7 @@ def permissions(self):
486
486
return (
487
487
current_auth .lastuserinfo is not None
488
488
and current_auth .lastuserinfo .permissions
489
- or []
490
- )
489
+ ) or []
491
490
492
491
def has_permission (self , permission ):
493
492
"""Returns True if the current user has the specified permission.
Original file line number Diff line number Diff line change 34
34
from . import UserInfo , UserManagerBase , __ , signal_user_looked_up
35
35
36
36
__all__ = [
37
- 'UserBase' ,
38
- 'UserBase2' ,
39
- 'TeamMixin' ,
40
- 'TeamMembersMixin' ,
41
- 'TeamBase' ,
42
- 'TeamBase2' ,
37
+ 'IncompleteUserMigrationError' ,
38
+ 'ProfileBase' ,
43
39
'ProfileMixin' ,
44
40
'ProfileMixin2' ,
45
- 'ProfileBase' ,
41
+ 'TeamBase' ,
42
+ 'TeamBase2' ,
43
+ 'TeamMembersMixin' ,
44
+ 'TeamMixin' ,
45
+ 'UserBase' ,
46
+ 'UserBase2' ,
46
47
'UserManager' ,
47
- 'IncompleteUserMigrationError' ,
48
48
]
49
49
50
50
@@ -140,10 +140,8 @@ def timezone(self):
140
140
# Stored in userinfo since it was introduced later and a new column
141
141
# will require migrations in downstream apps.
142
142
return (
143
- self .userinfo
144
- and self .userinfo .get ('timezone' )
145
- or current_app .config .get ('TIMEZONE' )
146
- )
143
+ self .userinfo and self .userinfo .get ('timezone' )
144
+ ) or current_app .config .get ('TIMEZONE' )
147
145
148
146
@property
149
147
def oldids (self ):
@@ -152,7 +150,7 @@ def oldids(self):
152
150
# will require migrations in downstream apps. Also, this is an array
153
151
# and will require (a) a joined table, (b) Postgres-specific arrays, or (c) data massaging
154
152
# by joining with spaces, like "access_scope" above.
155
- return self .userinfo and self .userinfo .get ('oldids' ) or []
153
+ return ( self .userinfo and self .userinfo .get ('oldids' ) ) or []
156
154
157
155
# Use cached_property here because pytz.timezone is relatively slow:
158
156
#
You can’t perform that action at this time.
0 commit comments