Merge ~j-rivero/ubuntu/+source/ros2-colcon-core:ubuntu/devel into ubuntu/+source/ros2-colcon-core:ubuntu/devel

[Jose Luis Rivero]

Import upstream patch to fix argument parsing in newer python 3.12 / python 3.11

See https://bugs.launchpad.net/ubuntu/+source/ros2-colcon-core/+bug/2060717 for details

[Benjamin Drung (bdrung)]

Thanks. Merged and uploaded.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index c2b9ade..dc2f135 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ros2-colcon-core (0.15.2-1ubuntu1) noble; urgency=medium
+
+  * Add patch to fix argument parsing with Python 3.12
+    (LP: #2060717)
+
+ -- Jose Luis Rivero <[e-mail]>  Tue, 09 Apr 2024 20:51:44 +0200
+
 ros2-colcon-core (0.15.2-1) unstable; urgency=medium
 
   * New upstream version 0.15.2
diff --git a/debian/control b/debian/control
index 529f59e..3b2c885 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ros2-colcon-core
 Section: python
 Priority: optional
-Maintainer: Debian Robotics Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Robotics Team <[e-mail]>
 Uploaders:
  Timo Röhling <[e-mail]>,
  Jochen Sprickerhof <[e-mail]>,
diff --git a/debian/patches/0004-Fix-argument-parsing-in-newer-Python.patch b/debian/patches/0004-Fix-argument-parsing-in-newer-Python.patch
new file mode 100644
index 0000000..63ab21b
--- /dev/null
+++ b/debian/patches/0004-Fix-argument-parsing-in-newer-Python.patch
@@ -0,0 +1,49 @@
+From: Chris Lalancette <[e-mail]>
+Subject: Fix argument parsing in newer Python
+Origin: upstream, https://github.com/colcon/colcon-core/pull/635
+
+---
+diff --git a/colcon_core/command.py b/colcon_core/command.py
+index fd159be10591..228d3b369099 100644
+--- a/colcon_core/command.py
++++ b/colcon_core/command.py
+@@ -226,7 +226,15 @@ def create_parser(environment_variables_group_name):
+ 
+         def _parse_optional(self, arg_string):
+             result = super()._parse_optional(arg_string)
+-            if result == (None, arg_string, None):
++            # Up until https://github.com/python/cpython/pull/114180 ,
++            # _parse_optional() returned a 3-tuple when it couldn't classify
++            # the option.  As of that PR (which is in Python 3.13, and
++            # backported to Python 3.12), it returns a 4-tuple.  Check for
++            # either here.
++            if result in (
++                (None, arg_string, None),
++                (None, arg_string, None, None),
++            ):
+                 # in the case there the arg is classified as an unknown 'O'
+                 # override that and classify it as an 'A'
+                 return None
+diff --git a/test/spell_check.words b/test/spell_check.words
+index 96051a0ff2c3..83548464c76a 100644
+--- a/test/spell_check.words
++++ b/test/spell_check.words
+@@ -3,6 +3,7 @@ apache
+ argparse
+ asyncio
+ autouse
++backported
+ basepath
+ bazqux
+ blocklist
+@@ -17,6 +18,7 @@ configparser
+ contextlib
+ coroutine
+ coroutines
++cpython
+ datetime
+ debian
+ debinfo
+-- 
+2.42.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 0a8df8d..11d19c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Respect-DEB_PYTHON_INSTALL_LAYOUT.patch
 0002-Ignore-DeprecationWarning-about-pkg_resources.patch
 0003-Use-pristine-home-directory-for-Python-tests.patch
+0004-Fix-argument-parsing-in-newer-Python.patch