mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-06-01 03:17:28 -07:00
ad9db81369
For removing test network restrictions on dev-util/maturin Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
111 lines
3.3 KiB
Diff
111 lines
3.3 KiB
Diff
https://github.com/mahmoud/boltons/commit/270e974
|
|
From: Mahmoud Hashemi <mahmoud@hatnote.com>
|
|
Date: Sun, 10 Oct 2021 23:26:24 -0700
|
|
Subject: [PATCH] address ecoutils import issue, fixes #294
|
|
--- a/boltons/ecoutils.py
|
|
+++ b/boltons/ecoutils.py
|
|
@@ -354,38 +354,53 @@ def get_profile(**kwargs):
|
|
return ret
|
|
|
|
|
|
-_real_safe_repr = pprint._safe_repr
|
|
-
|
|
-
|
|
-def _fake_json_dumps(val, indent=2):
|
|
- # never do this. this is a hack for Python 2.4. Python 2.5 added
|
|
- # the json module for a reason.
|
|
- def _fake_safe_repr(*a, **kw):
|
|
- res, is_read, is_rec = _real_safe_repr(*a, **kw)
|
|
- if res == 'None':
|
|
- res = 'null'
|
|
- if res == 'True':
|
|
- res = 'true'
|
|
- if res == 'False':
|
|
- res = 'false'
|
|
- if not (res.startswith("'") or res.startswith("u'")):
|
|
- res = res
|
|
- else:
|
|
- if res.startswith('u'):
|
|
- res = res[1:]
|
|
+try:
|
|
+ import json
|
|
+
|
|
+ def dumps(val, indent):
|
|
+ if indent:
|
|
+ return json.dumps(val, sort_keys=True, indent=indent)
|
|
+ return json.dumps(val, sort_keys=True)
|
|
+
|
|
+except ImportError:
|
|
+ _real_safe_repr = pprint._safe_repr
|
|
+
|
|
+ def _fake_json_dumps(val, indent=2):
|
|
+ # never do this. this is a hack for Python 2.4. Python 2.5 added
|
|
+ # the json module for a reason.
|
|
+ def _fake_safe_repr(*a, **kw):
|
|
+ res, is_read, is_rec = _real_safe_repr(*a, **kw)
|
|
+ if res == 'None':
|
|
+ res = 'null'
|
|
+ if res == 'True':
|
|
+ res = 'true'
|
|
+ if res == 'False':
|
|
+ res = 'false'
|
|
+ if not (res.startswith("'") or res.startswith("u'")):
|
|
+ res = res
|
|
+ else:
|
|
+ if res.startswith('u'):
|
|
+ res = res[1:]
|
|
|
|
- contents = res[1:-1]
|
|
- contents = contents.replace('"', '').replace(r'\"', '')
|
|
- res = '"' + contents + '"'
|
|
- return res, is_read, is_rec
|
|
+ contents = res[1:-1]
|
|
+ contents = contents.replace('"', '').replace(r'\"', '')
|
|
+ res = '"' + contents + '"'
|
|
+ return res, is_read, is_rec
|
|
|
|
- pprint._safe_repr = _fake_safe_repr
|
|
- try:
|
|
- ret = pprint.pformat(val, indent=indent)
|
|
- finally:
|
|
- pprint._safe_repr = _real_safe_repr
|
|
+ pprint._safe_repr = _fake_safe_repr
|
|
+ try:
|
|
+ ret = pprint.pformat(val, indent=indent)
|
|
+ finally:
|
|
+ pprint._safe_repr = _real_safe_repr
|
|
+
|
|
+ return ret
|
|
+
|
|
+ def dumps(val, indent):
|
|
+ ret = _fake_json_dumps(val, indent=indent)
|
|
+ if not indent:
|
|
+ ret = re.sub(r'\n\s*', ' ', ret)
|
|
+ return ret
|
|
|
|
- return ret
|
|
|
|
|
|
def get_profile_json(indent=False):
|
|
@@ -393,20 +408,6 @@ def get_profile_json(indent=False):
|
|
indent = 2
|
|
else:
|
|
indent = 0
|
|
- try:
|
|
- import json
|
|
-
|
|
- def dumps(val, indent):
|
|
- if indent:
|
|
- return json.dumps(val, sort_keys=True, indent=indent)
|
|
- return json.dumps(val, sort_keys=True)
|
|
-
|
|
- except ImportError:
|
|
- def dumps(val, indent):
|
|
- ret = _fake_json_dumps(val, indent=indent)
|
|
- if not indent:
|
|
- ret = re.sub(r'\n\s*', ' ', ret)
|
|
- return ret
|
|
|
|
data_dict = get_profile()
|
|
return dumps(data_dict, indent)
|