- satisfy pylint recommendations against logging f-strings

Miguel Barão
1 parent 74635609
Showing 1 changed file with 10 additions and 9 deletions Show diff stats
perguntations/serve.py
@@ -63,7 +63,8 @@ class WebApplication(tornado.web.Application):
 # ----------------------------------------------------------------------------
 def admin_only(func):
     '''
-    Decorator used to restrict access to the administrator. For example:
+    Decorator used to restrict access to the administrator.
+    Example:
  
         @admin_only()
         def get(self): ...
@@ -91,7 +92,7 @@ class BaseHandler(tornado.web.RequestHandler):
  
     def get_current_user(self):
         '''
-        HTML is stateless, so a cookie is used to identify the user.
+        Since HTTP is stateless, a cookie is used to identify the user.
         This function returns the cookie for the current user.
         '''
         cookie = self.get_secure_cookie('user')
@@ -253,7 +254,7 @@ class AdminHandler(BaseHandler):
                                             name=student['name'])
  
         else:
-            logging.error(f'Unknown command: "{cmd}"')
+            logging.error('Unknown command: "%s"', cmd)
  
  
 # ----------------------------------------------------------------------------
@@ -346,11 +347,11 @@ class FileHandler(BaseHandler):
                 try:
                     file = open(filepath, 'rb')
                 except FileNotFoundError:
-                    logging.error(f'File not found: {filepath}')
+                    logging.error('File not found: %s', filepath)
                 except PermissionError:
-                    logging.error(f'No permission: {filepath}')
+                    logging.error('No permission: %s', filepath)
                 except OSError:
-                    logging.error(f'Error opening file: {filepath}')
+                    logging.error('Error opening file: %s', filepath)
                 else:
                     data = file.read()
                     file.close()
@@ -475,7 +476,7 @@ class ReviewHandler(BaseHandler):
         Opens JSON file with a given corrected test and renders it
         '''
         test_id = self.get_query_argument('test_id', None)
-        logging.info(f'Review test {test_id}.')
+        logging.info('Review test %s.', test_id)
         fname = self.testapp.get_json_filename_of_test(test_id)
  
         if fname is None:
@@ -530,10 +531,10 @@ def run_webserver(app, ssl_opt, port, debug):
     try:
         httpserver.listen(port)
     except OSError:
-        logging.critical(f'Cannot bind port {port}. Already in use?')
+        logging.critical('Cannot bind port %d. Already in use?', port)
         sys.exit(1)
  
-    logging.info(f'Webserver listening on {port}...  (Ctrl-C to stop)')
+    logging.info('Webserver listening on %d...  (Ctrl-C to stop)', port)
     signal.signal(signal.SIGINT, signal_handler)
  
     # --- run webserver
...	...	@@ -63,7 +63,8 @@ class WebApplication(tornado.web.Application):
63	63	# ----------------------------------------------------------------------------
64	64	def admin_only(func):
65	65	'''
66		- Decorator used to restrict access to the administrator. For example:
	66	+ Decorator used to restrict access to the administrator.
	67	+ Example:
67	68
68	69	@admin_only()
69	70	def get(self): ...
...	...	@@ -91,7 +92,7 @@ class BaseHandler(tornado.web.RequestHandler):
91	92
92	93	def get_current_user(self):
93	94	'''
94		- HTML is stateless, so a cookie is used to identify the user.
	95	+ Since HTTP is stateless, a cookie is used to identify the user.
95	96	This function returns the cookie for the current user.
96	97	'''
97	98	cookie = self.get_secure_cookie('user')
...	...	@@ -253,7 +254,7 @@ class AdminHandler(BaseHandler):
253	254	name=student['name'])
254	255
255	256	else:
256		- logging.error(f'Unknown command: "{cmd}"')
	257	+ logging.error('Unknown command: "%s"', cmd)
257	258
258	259
259	260	# ----------------------------------------------------------------------------
...	...	@@ -346,11 +347,11 @@ class FileHandler(BaseHandler):
346	347	try:
347	348	file = open(filepath, 'rb')
348	349	except FileNotFoundError:
349		- logging.error(f'File not found: {filepath}')
	350	+ logging.error('File not found: %s', filepath)
350	351	except PermissionError:
351		- logging.error(f'No permission: {filepath}')
	352	+ logging.error('No permission: %s', filepath)
352	353	except OSError:
353		- logging.error(f'Error opening file: {filepath}')
	354	+ logging.error('Error opening file: %s', filepath)
354	355	else:
355	356	data = file.read()
356	357	file.close()
...	...	@@ -475,7 +476,7 @@ class ReviewHandler(BaseHandler):
475	476	Opens JSON file with a given corrected test and renders it
476	477	'''
477	478	test_id = self.get_query_argument('test_id', None)
478		- logging.info(f'Review test {test_id}.')
	479	+ logging.info('Review test %s.', test_id)
479	480	fname = self.testapp.get_json_filename_of_test(test_id)
480	481
481	482	if fname is None:
...	...	@@ -530,10 +531,10 @@ def run_webserver(app, ssl_opt, port, debug):
530	531	try:
531	532	httpserver.listen(port)
532	533	except OSError:
533		- logging.critical(f'Cannot bind port {port}. Already in use?')
	534	+ logging.critical('Cannot bind port %d. Already in use?', port)
534	535	sys.exit(1)
535	536
536		- logging.info(f'Webserver listening on {port}... (Ctrl-C to stop)')
	537	+ logging.info('Webserver listening on %d... (Ctrl-C to stop)', port)
537	538	signal.signal(signal.SIGINT, signal_handler)
538	539
539	540	# --- run webserver
...	...