mirror of
https://github.com/ansible/awx.git
synced 2026-04-13 22:19:27 -02:30
fix: compatibility with black v25+ (#15789)
This commit is contained in:
@@ -832,7 +832,7 @@ class CredentialTypeInjectorField(JSONSchemaField):
|
|||||||
'type': 'string',
|
'type': 'string',
|
||||||
# The environment variable _value_ can be any ascii,
|
# The environment variable _value_ can be any ascii,
|
||||||
# but pexpect will choke on any unicode
|
# but pexpect will choke on any unicode
|
||||||
'pattern': '^[\x00-\x7F]*$',
|
'pattern': '^[\x00-\x7f]*$',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'additionalProperties': False,
|
'additionalProperties': False,
|
||||||
|
|||||||
@@ -17,8 +17,8 @@ tables_to_drop = [
|
|||||||
'djkombu_message',
|
'djkombu_message',
|
||||||
'djkombu_queue',
|
'djkombu_queue',
|
||||||
]
|
]
|
||||||
postgres_sql = ([("DROP TABLE IF EXISTS {} CASCADE;".format(table))] for table in tables_to_drop)
|
postgres_sql = (["DROP TABLE IF EXISTS {} CASCADE;".format(table)] for table in tables_to_drop)
|
||||||
sqlite_sql = ([("DROP TABLE IF EXISTS {};".format(table))] for table in tables_to_drop)
|
sqlite_sql = (["DROP TABLE IF EXISTS {};".format(table)] for table in tables_to_drop)
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ def test_ansi_stdout_filtering(sqlite_copy, Parent, Child, relation, view, downl
|
|||||||
job = Parent()
|
job = Parent()
|
||||||
job.save()
|
job.save()
|
||||||
for i in range(3):
|
for i in range(3):
|
||||||
Child(**{relation: job, 'stdout': '\x1B[0;36mTesting {}\x1B[0m\n'.format(i), 'start_line': i}).save()
|
Child(**{relation: job, 'stdout': '\x1b[0;36mTesting {}\x1b[0m\n'.format(i), 'start_line': i}).save()
|
||||||
url = reverse(view, kwargs={'pk': job.pk})
|
url = reverse(view, kwargs={'pk': job.pk})
|
||||||
|
|
||||||
# ansi codes in ?format=txt should get filtered
|
# ansi codes in ?format=txt should get filtered
|
||||||
@@ -96,7 +96,7 @@ def test_ansi_stdout_filtering(sqlite_copy, Parent, Child, relation, view, downl
|
|||||||
# ask for ansi and you'll get it
|
# ask for ansi and you'll get it
|
||||||
fmt = "?format={}".format("ansi_download" if download else "ansi")
|
fmt = "?format={}".format("ansi_download" if download else "ansi")
|
||||||
response = get(url + fmt, user=admin, expect=200)
|
response = get(url + fmt, user=admin, expect=200)
|
||||||
assert smart_str(response.content).splitlines() == ['\x1B[0;36mTesting %d\x1B[0m' % i for i in range(3)]
|
assert smart_str(response.content).splitlines() == ['\x1b[0;36mTesting %d\x1b[0m' % i for i in range(3)]
|
||||||
has_download_header = response.has_header('Content-Disposition')
|
has_download_header = response.has_header('Content-Disposition')
|
||||||
assert has_download_header if download else not has_download_header
|
assert has_download_header if download else not has_download_header
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ def test_colorized_html_stdout(sqlite_copy, Parent, Child, relation, view, get,
|
|||||||
job = Parent()
|
job = Parent()
|
||||||
job.save()
|
job.save()
|
||||||
for i in range(3):
|
for i in range(3):
|
||||||
Child(**{relation: job, 'stdout': '\x1B[0;36mTesting {}\x1B[0m\n'.format(i), 'start_line': i}).save()
|
Child(**{relation: job, 'stdout': '\x1b[0;36mTesting {}\x1b[0m\n'.format(i), 'start_line': i}).save()
|
||||||
url = reverse(view, kwargs={'pk': job.pk}) + '?format=html'
|
url = reverse(view, kwargs={'pk': job.pk}) + '?format=html'
|
||||||
|
|
||||||
response = get(url, user=admin, expect=200)
|
response = get(url, user=admin, expect=200)
|
||||||
|
|||||||
@@ -118,8 +118,8 @@ class TestSmartFilterQueryFromString:
|
|||||||
@pytest.mark.parametrize(
|
@pytest.mark.parametrize(
|
||||||
"filter_string,q_expected",
|
"filter_string,q_expected",
|
||||||
[
|
[
|
||||||
(u'(a=abc\u1F5E3def)', Q(**{u"a": u"abc\u1F5E3def"})),
|
(u'(a=abc\u1f5e3def)', Q(**{u"a": u"abc\u1f5e3def"})),
|
||||||
(u'(ansible_facts__a=abc\u1F5E3def)', Q(**{u"ansible_facts__contains": {u"a": u"abc\u1F5E3def"}})),
|
(u'(ansible_facts__a=abc\u1f5e3def)', Q(**{u"ansible_facts__contains": {u"a": u"abc\u1f5e3def"}})),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
def test_unicode(self, mock_get_host_model, filter_string, q_expected):
|
def test_unicode(self, mock_get_host_model, filter_string, q_expected):
|
||||||
|
|||||||
@@ -266,9 +266,9 @@ def random_utf8(*args, **kwargs):
|
|||||||
exception when a character outside of the BMP is sent to `send_keys`.
|
exception when a character outside of the BMP is sent to `send_keys`.
|
||||||
Code pulled from http://stackoverflow.com/a/3220210.
|
Code pulled from http://stackoverflow.com/a/3220210.
|
||||||
"""
|
"""
|
||||||
pattern = re.compile('[^\u0000-\uD7FF\uE000-\uFFFF]', re.UNICODE)
|
pattern = re.compile('[^\u0000-\ud7ff\ue000-\uffff]', re.UNICODE)
|
||||||
length = args[0] if len(args) else kwargs.get('length', 10)
|
length = args[0] if len(args) else kwargs.get('length', 10)
|
||||||
scrubbed = pattern.sub('\uFFFD', ''.join([gen_utf_char() for _ in range(length)]))
|
scrubbed = pattern.sub('\ufffd', ''.join([gen_utf_char() for _ in range(length)]))
|
||||||
|
|
||||||
return scrubbed
|
return scrubbed
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user