From ada6a999e4f5cca21a2133e449f4576dbe9a64d2 Mon Sep 17 00:00:00 2001
From: Isaac Dadzie <4581114+idadzie@users.noreply.github.com>
Date: Fri, 4 Feb 2022 21:18:37 +0000
Subject: [PATCH] Add support for black 22.1.0

Make changes to support black 22.1.0, which changed the return type
of 'find_project_root' to a tuple.

Resolves: #40
---
 pyls_black/plugin.py | 8 +++++++-
 setup.cfg            | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pyls_black/plugin.py b/pyls_black/plugin.py
index dc5d482..e4f4d98 100644
--- a/pyls_black/plugin.py
+++ b/pyls_black/plugin.py
@@ -73,7 +73,13 @@ def load_config(filename: str) -> Dict:
 
     root = black.find_project_root((filename,))
 
-    pyproject_filename = root / "pyproject.toml"
+    # Note: find_project_root returns a tuple in 22.1.0+
+    try:
+        # Keeping this to not break backward compatibility.
+        pyproject_filename = root / "pyproject.toml"
+    except TypeError:
+        _root, _ = root
+        pyproject_filename = _root / "pyproject.toml"
 
     if not pyproject_filename.is_file():
         return defaults
diff --git a/setup.cfg b/setup.cfg
index 036cec2..57fbe4f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pyls-black
-version = 0.4.7
+version = 0.4.8
 author = Rupert Bedford
 author_email = rupert@rupertb.com
 description = Black plugin for the Python Language Server
ab1c59c5be0c525f86'>commit</a><a href='/guix/diff/gnu/bootloader/u-boot.scm?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/bootloader/u-boot.scm'>
<input type='hidden' name='id' value='8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'>root</a>/<a href='/guix/log/gnu?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'>gnu</a>/<a href='/guix/log/gnu/bootloader?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'>bootloader</a>/<a href='/guix/log/gnu/bootloader/u-boot.scm?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86'>u-boot.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/bootloader/u-boot.scm?id=8a8bd15bfa640e2a377f44ab1c59c5be0c525f86&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-18 21:25:25 -0500'>2023-01-18</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=9530ee9f9c89cbbf35589727e9fdb373ed7f47fa'>gnu: Add u-boot-ts7970-q-2g-1000mhz-c-bootloader.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/u-boot.scm (u-boot-ts7970-q-2g-1000mhz-c-bootloader): New
variable.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-12-28 22:14:16 -0500'>2022-12-28</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=d6ea9f8b38df7de1194d8106488a8c33cce64fd1'>gnu: u-boot-am335x-boneblack: Revert to old name.</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts to the name this package had previous to commit
c2c1dfdf5760873f1db86d14873f725a105f7feb ("gnu: bootloader: Add U-Boot
packages for Raspberry Pi models."), which caused the package name to be
derived from the board name.

* gnu/packages/bootloaders.scm (u-boot-am335x-evm-boneblack): Remove the
NAME-SUFFIX keyword argument.  Specify the full name via the name field.
* gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust to
the renamed package.

Reported-by: Vagrant Cascadian &lt;vagrant@debian.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-12-20 21:29:25 -0500'>2022-12-20</span></td><td><a href='/guix/commit/gnu/bootloader/u-boot.scm?id=c04528d2a2597d79278833f3607c806278253446'>gnu: u-boot-am335x-evm-boneblack: Fix variable name.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to...
(u-boot-am335x-evm-boneblack), to match the package name.
* gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust
accordingly.
</span></span></td><td>Maxim Cournoyer</td></tr>