# HG changeset patch # User RhodeCode Admin # Date 2023-07-17 13:03:28 # Node ID dcbf3e8abc8b94140c9101cb27b19f174e55a503 # Parent 444b916d02e055081a894d873486d216cbe4bde5 vendor: python3 fixes diff --git a/rhodecode/lib/_vendor/jsonlogger/__init__.py b/rhodecode/lib/_vendor/jsonlogger/__init__.py --- a/rhodecode/lib/_vendor/jsonlogger/__init__.py +++ b/rhodecode/lib/_vendor/jsonlogger/__init__.py @@ -3,7 +3,6 @@ This library is provided to allow standa to output log data as JSON formatted strings ''' import logging -import json import re from datetime import date, datetime, time, tzinfo, timedelta import traceback @@ -13,6 +12,8 @@ from inspect import istraceback from collections import OrderedDict from rhodecode.lib.logging_formatter import _inject_req_id, ExceptionAwareFormatter +from rhodecode.lib.ext_json import sjson as json + ZERO = timedelta(0) HOUR = timedelta(hours=1) diff --git a/rhodecode/lib/_vendor/statsd/__init__.py b/rhodecode/lib/_vendor/statsd/__init__.py --- a/rhodecode/lib/_vendor/statsd/__init__.py +++ b/rhodecode/lib/_vendor/statsd/__init__.py @@ -16,7 +16,7 @@ log = logging.getLogger('rhodecode.stats def statsd_config(config, prefix='statsd.'): _config = {} - for key in config.keys(): + for key in list(config.keys()): if key.startswith(prefix): _config[key[len(prefix):]] = config[key] return _config