From 7b11a2b70ae767fc04260bfa8a1a87a2067e8a37 Mon Sep 17 00:00:00 2001
From: Peter Braun <pbraun@redhat.com>
Date: Wed, 29 Jan 2025 15:50:25 +0100
Subject: [PATCH] fix: compatibility with black v25+

---
 awx/main/fields.py                                        | 2 +-
 awx/main/migrations/0050_v340_drop_celery_tables.py       | 4 ++--
 awx/main/tests/functional/api/test_unified_jobs_stdout.py | 6 +++---
 awx/main/tests/unit/utils/test_filters.py                 | 4 ++--
 awxkit/awxkit/utils/__init__.py                           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/awx/main/fields.py b/awx/main/fields.py
index 7a74aadb3c3c..90dcc453fb0b 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -832,7 +832,7 @@ def schema(self, model_instance):
                             'type': 'string',
                             # The environment variable _value_ can be any ascii,
                             # but pexpect will choke on any unicode
-                            'pattern': '^[\x00-\x7F]*$',
+                            'pattern': '^[\x00-\x7f]*$',
                         },
                     },
                     'additionalProperties': False,
diff --git a/awx/main/migrations/0050_v340_drop_celery_tables.py b/awx/main/migrations/0050_v340_drop_celery_tables.py
index ce34d81ef3f1..2421c92d9536 100644
--- a/awx/main/migrations/0050_v340_drop_celery_tables.py
+++ b/awx/main/migrations/0050_v340_drop_celery_tables.py
@@ -17,8 +17,8 @@
     'djkombu_message',
     'djkombu_queue',
 ]
-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)
+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)
 
 
 class Migration(migrations.Migration):
diff --git a/awx/main/tests/functional/api/test_unified_jobs_stdout.py b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
index 3dcef8f0e713..3565a73d77a7 100644
--- a/awx/main/tests/functional/api/test_unified_jobs_stdout.py
+++ b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
@@ -83,7 +83,7 @@ def test_ansi_stdout_filtering(sqlite_copy, Parent, Child, relation, view, downl
     job = Parent()
     job.save()
     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})
 
     # 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
     fmt = "?format={}".format("ansi_download" if download else "ansi")
     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')
     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.save()
     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'
 
     response = get(url, user=admin, expect=200)
diff --git a/awx/main/tests/unit/utils/test_filters.py b/awx/main/tests/unit/utils/test_filters.py
index 83d9da0e4f2b..c2b23de0eea0 100644
--- a/awx/main/tests/unit/utils/test_filters.py
+++ b/awx/main/tests/unit/utils/test_filters.py
@@ -118,8 +118,8 @@ def test_forbidden_filter_string(self, mock_get_host_model, filter_string):
     @pytest.mark.parametrize(
         "filter_string,q_expected",
         [
-            (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'(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"}})),
         ],
     )
     def test_unicode(self, mock_get_host_model, filter_string, q_expected):
diff --git a/awxkit/awxkit/utils/__init__.py b/awxkit/awxkit/utils/__init__.py
index b435b764308d..772a21227fb2 100644
--- a/awxkit/awxkit/utils/__init__.py
+++ b/awxkit/awxkit/utils/__init__.py
@@ -266,9 +266,9 @@ def random_utf8(*args, **kwargs):
     exception when a character outside of the BMP is sent to `send_keys`.
     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)
-    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