From: Tom Tromey <tromey@adacore.com>
Date: Wed, 20 Mar 2024 15:36:40 +0000 (-0600)
Subject: Prepare gdb for isort
X-Git-Tag: gdb-15-branchpoint~531
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68982f618b28aebf47343922fb79e59ace0246eb;p=thirdparty%2Fbinutils-gdb.git

Prepare gdb for isort

This patch prepares gdb for isort: it adds a couple of isort marker
comments where needed, and it adds an isort clause to setup.cfg.

Approved-By: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py
index aae0d3680aa..9db91d8261b 100644
--- a/gdb/python/lib/gdb/__init__.py
+++ b/gdb/python/lib/gdb/__init__.py
@@ -31,6 +31,8 @@ import _gdb
 # Note that two indicators are needed here to silence flake8.
 from _gdb import *  # noqa: F401,F403
 
+# isort: split
+
 # Historically, gdb.events was always available, so ensure it's
 # still available without an explicit import.
 import _gdbevents as events
diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py
index 784015d1a07..51b95468a70 100644
--- a/gdb/python/lib/gdb/dap/__init__.py
+++ b/gdb/python/lib/gdb/dap/__init__.py
@@ -18,6 +18,8 @@ import os
 # This must come before other DAP imports.
 from . import startup
 
+# isort: split
+
 # Load modules that define commands.  These imports intentionally
 # ignore the unused import warning, as these modules are being loaded
 # for their side effects -- namely, registering DAP commands with the
@@ -36,6 +38,7 @@ from . import scopes  # noqa: F401
 from . import sources  # noqa: F401
 from . import threads  # noqa: F401
 
+# isort: split
 from .server import Server
 
 
diff --git a/gdb/setup.cfg b/gdb/setup.cfg
index 2e83eb5cf56..d33058ea7f0 100644
--- a/gdb/setup.cfg
+++ b/gdb/setup.cfg
@@ -7,3 +7,6 @@
 # E701: Multiple statements on one line (colon)
 # W503: line break before binary operator
 ignore = E203,E501,E701,W503
+
+[isort]
+profile = black