forked from mrlan/EnglishPal
				
			Compare commits
	
		
			2 Commits 
		
	
	
		
			master
			...
			Bug487-WuY
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  | 345f751c16 | |
|  | 02efc30dcf | 
							
								
								
									
										11
									
								
								app/Login.py
								
								
								
								
							
							
						
						
									
										11
									
								
								app/Login.py
								
								
								
								
							|  | @ -98,6 +98,9 @@ class UserName: | ||||||
|         for c in self.username: # a user name must not include special characters, except non-leading periods or underscores |         for c in self.username: # a user name must not include special characters, except non-leading periods or underscores | ||||||
|             if c in string.punctuation and c is not '.' and c is not '_': |             if c in string.punctuation and c is not '.' and c is not '_': | ||||||
|                 return f'{c} is not allowed in the user name.' |                 return f'{c} is not allowed in the user name.' | ||||||
|  |         if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del']: | ||||||
|  |             return 'You used a restricted word as your user name.  Please come up with a better one.' | ||||||
|  | 
 | ||||||
|         return 'OK' |         return 'OK' | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | @ -106,11 +109,5 @@ class WarningMessage: | ||||||
|         self.s = s |         self.s = s | ||||||
| 
 | 
 | ||||||
|     def __str__(self): |     def __str__(self): | ||||||
|         result = UserName(self.s).validate() |         return UserName(self.s).validate() | ||||||
|         if result != 'OK': |  | ||||||
|             return result |  | ||||||
| 
 | 
 | ||||||
|         if self.s in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del']: |  | ||||||
|             return 'You used a restricted word as the user name.  Please come up with a better one.' |  | ||||||
| 
 |  | ||||||
|         return 'OK' |  | ||||||
|  |  | ||||||
|  | @ -1,5 +1,6 @@ | ||||||
| from flask import * | from flask import * | ||||||
| from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, UserName, WarningMessage | from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, WarningMessage | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| # 初始化蓝图 | # 初始化蓝图 | ||||||
| accountService = Blueprint("accountService", __name__) | accountService = Blueprint("accountService", __name__) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue