Merge pull request #6 from BoboTiG/fix-resource-warnings

Fix several DeprecationWarnings

appkernel/engine.py

@@ -270,7 +270,7 @@ def run(self):
                 print(f'=== starting server ===')
                 self.http_server.serve_forever(stop_timeout=shutdown_timeout)
             except ImportError:
-                self.app.logger.warn(
+                self.app.logger.warning(
                     '--> falling back to the builtin development server (since gevent is missing / issue: pip install gevent')
                 self.app.run(debug=self.development, threaded=True)
 
@@ -384,7 +384,7 @@ def generic_error_handler(self, ex: Exception = None, upstream_service: str = No
             self.logger.exception('generic error handler: {}/{}'.format(ex.__class__.__name__, str(ex)))
         else:
             msg = 'Generic server error.'
-            self.logger.warn('generic error handler: {}/{}'.format(ex.__class__.__name__, str(ex)))
+            self.logger.warning('generic error handler: {}/{}'.format(ex.__class__.__name__, str(ex)))
         return create_custom_error(code, msg, upstream_service=upstream_service)
 
     def teardown(self, exception):
@@ -395,7 +395,7 @@ def teardown(self, exception):
         :return:
         """
         if exception is not None:
-            self.app.logger.warn(exception.message if hasattr(exception, 'message') else str(exception))
+            self.app.logger.warning(exception.message if hasattr(exception, 'message') else str(exception))
 
     def register(self, service_class_or_instance, url_base=None, methods=['GET'],
                  enable_hateoas=True) -> ResourceController:

appkernel/query.py

@@ -14,19 +14,19 @@ class QueryProcessor(object):
     def __init__(self):
         # self.query_pattern = re.compile('^(\w+:[\[\],\<\>A-Za-z0-9_\s-]+)(,\w+:[\[\],\<\>A-Za-z0-9_\s-]+)*$')
         self.csv_pattern = re.compile('^.*,.*$')
-        self.json_pattern = re.compile('\{.*\:\{.*\:.*\}\}')
+        self.json_pattern = re.compile(r'\{.*\:\{.*\:.*\}\}')
         self.date_patterns = {
-            re.compile('^(0?[1-9]|[12][0-9]|3[01])(\/|-|\.)(0?[1-9]|1[012])(\/|-|\.)\d{4}$'): '%d{0}%m{0}%Y',
+            re.compile(r'^(0?[1-9]|[12][0-9]|3[01])(\/|-|\.)(0?[1-9]|1[012])(\/|-|\.)\d{4}$'): '%d{0}%m{0}%Y',
             # 31/02/4500
-            re.compile('^\d{4}(\/|-|\.)(0?[1-9]|1[012])(\/|-|\.)(0?[1-9]|[12][0-9]|3[01])$'): '%Y{0}%m{0}%d'
+            re.compile(r'^\d{4}(\/|-|\.)(0?[1-9]|1[012])(\/|-|\.)(0?[1-9]|[12][0-9]|3[01])$'): '%Y{0}%m{0}%d'
             # 4500/02/31,
         }
         self.number_pattern = re.compile('^[-+]?[0-9]+$')
         self.boolean_pattern = re.compile('^(true|false|True|False|y|yes|no)$')
         self.date_separator_patterns = {
             re.compile('([0-9].*-)+.*'): '-',
-            re.compile('([0-9].*\/)+.*'): '/',
-            re.compile('([0-9].*\.)+.*'): '.',
+            re.compile(r'([0-9].*\/)+.*'): '/',
+            re.compile(r'([0-9].*\.)+.*'): '.',
         }
         self.expression_mapper = {
             '<': lambda exp: ('$lte', exp),

appkernel/service.py

@@ -270,7 +270,7 @@ def action_executor(**named_args):
                     result_dic_tentative = {} if result is None else _xvert(cls, result)
                     return jsonify(result_dic_tentative), 200
                 except ServiceException as sexc:
-                    config.app_engine.logger.warn('Service error: {}'.format(str(sexc)))
+                    config.app_engine.logger.warning('Service error: {}'.format(str(sexc)))
                     return create_custom_error(sexc.http_error_code, sexc.message, cls.__name__)
                 except Exception as exc:
                     config.app_engine.logger.exception(exc)
@@ -394,10 +394,10 @@ def create_executor(**named_args):
             result_dic_tentative = {} if result is None else _xvert(cls, result)
             return jsonify(result_dic_tentative), return_code
         except PropertyRequiredException as pexc:
-            app_engine.logger.warn('missing parameter: {}/{}'.format(pexc.__class__.__name__, str(pexc)))
+            app_engine.logger.warning('missing parameter: {}/{}'.format(pexc.__class__.__name__, str(pexc)))
             return create_custom_error(400, str(pexc), cls.__name__)
         except ValidationException as vexc:
-            app_engine.logger.warn('validation error: {}'.format(str(vexc)))
+            app_engine.logger.warning('validation error: {}'.format(str(vexc)))
             return create_custom_error(400, '{}/{}'.format(vexc.__class__.__name__, str(vexc)),
                                        cls.__name__)
         except RequestHandlingException as rexc:

appkernel/validators.py

@@ -73,7 +73,7 @@ class Email(Regexp):
 
     def __init__(self):
         super(Email, self).__init__(
-            '(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])')
+            r'(?:[a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])')
 
 
 class Min(Validator):