From f34e2de8c72201ae2f0861a7e0a5a2f21481b4bf Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Sat, 22 Jan 2022 23:39:13 +0100
Subject: [PATCH] Switch from naturalsort to natsort (#1318)

pyocd/commands/commands.py:
Use natsort's `natsorted()` instead of naturalsort's `natsort()`.

setup.cfg:
Replace naturalsort with natsort.

Fixes #1317
---
 pyocd/commands/commands.py | 5 +++--
 setup.cfg                  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pyocd/commands/commands.py b/pyocd/commands/commands.py
index db4b23cf7..ef50720b3 100755
--- a/pyocd/commands/commands.py
+++ b/pyocd/commands/commands.py
@@ -1,6 +1,7 @@
 # pyOCD debugger
 # Copyright (c) 2015-2020 Arm Limited
 # Copyright (c) 2021 Chris Reed
+# Copyright (c) 2022 David Runge
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +18,7 @@
 
 import logging
 import os
-from natsort import natsort
+from natsort import natsorted
 import textwrap
 from time import sleep
 from shutil import get_terminal_size
@@ -116,7 +117,7 @@ def execute(self):
 
 class RegisterCommandBase(CommandBase):
     def dump_register_group(self, group_name):
-        regs = natsort(self.context.selected_core.core_registers.iter_matching(
+        regs = natsorted(self.context.selected_core.core_registers.iter_matching(
                 lambda r: r.group == group_name), key=lambda r: r.name)
         reg_values = self.context.selected_core.read_core_registers_raw(r.name for r in regs)
 
diff --git a/setup.cfg b/setup.cfg
index e927e448d..b1c6afee6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,7 +55,7 @@ install_requires =
     intelhex>=2.0,<3.0
     intervaltree>=3.0.2,<4.0
     libusb-package>=1.0,<2.0
-    naturalsort>=1.5,<2.0
+    natsort>=8.0.0,<9.0
     prettytable>=2.0,<3.0
     pyelftools<1.0
     pylink-square>=0.11.1,<1.0