From b18e91f8a41496fbf38fe63ba866bef6c321d1fc Mon Sep 17 00:00:00 2001
From: Christoph Erhardt <fedora@sicherha.de>
Date: Jun 23 2022 10:27:30 +0000
Subject: Fix build error with Python 3.11 (#2022396)


---

diff --git a/0001-Ensure-compatibility-with-Python-3.11.patch b/0001-Ensure-compatibility-with-Python-3.11.patch
new file mode 100644
index 0000000..8b97591
--- /dev/null
+++ b/0001-Ensure-compatibility-with-Python-3.11.patch
@@ -0,0 +1,100 @@
+From 6238d9e8b78f5327f60bd1d2606a37f951a3cd9c Mon Sep 17 00:00:00 2001
+Message-Id: <6238d9e8b78f5327f60bd1d2606a37f951a3cd9c.1655928893.git.github@sicherha.de>
+From: Christoph Erhardt <github@sicherha.de>
+Date: Wed, 22 Jun 2022 21:42:53 +0200
+Subject: [PATCH] Ensure compatibility with Python 3.11
+
+* Replace deprecated `getargspec()` with `getfullargspec()`
+* Replace deprecated `formatargspec()` with custom implementation
+
+Fixes #2209.
+---
+ docs/source/powerline_autodoc.py |  6 ++----
+ powerline/lint/inspect.py        | 34 +++++++++++++++++++++++++++++---
+ 2 files changed, 33 insertions(+), 7 deletions(-)
+
+diff --git a/docs/source/powerline_autodoc.py b/docs/source/powerline_autodoc.py
+index eba42edb..83996aea 100644
+--- a/docs/source/powerline_autodoc.py
++++ b/docs/source/powerline_autodoc.py
+@@ -3,11 +3,9 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
+ 
+ import os
+ 
+-from inspect import formatargspec
+-
+ from sphinx.ext import autodoc
+ 
+-from powerline.lint.inspect import getconfigargspec
++from powerline.lint.inspect import formatconfigargspec, getconfigargspec
+ from powerline.segments import Segment
+ from powerline.lib.unicode import unicode
+ 
+@@ -28,7 +26,7 @@ class ThreadedDocumenter(autodoc.FunctionDocumenter):
+ 
+ 	def format_args(self):
+ 		argspec = getconfigargspec(self.object)
+-		return formatargspec(*argspec, formatvalue=formatvalue).replace('\\', '\\\\')
++		return formatconfigargspec(*argspec, formatvalue=formatvalue).replace('\\', '\\\\')
+ 
+ 
+ class Repr(object):
+diff --git a/powerline/lint/inspect.py b/powerline/lint/inspect.py
+index 15bb6103..7ab720f8 100644
+--- a/powerline/lint/inspect.py
++++ b/powerline/lint/inspect.py
+@@ -1,7 +1,8 @@
+ # vim:fileencoding=utf-8:noet
+ from __future__ import (unicode_literals, division, absolute_import, print_function)
+ 
+-from inspect import ArgSpec, getargspec
++from inspect import FullArgSpec, getfullargspec
++from itertools import zip_longest
+ 
+ from powerline.segments import Segment
+ 
+@@ -33,7 +34,7 @@ def getconfigargspec(obj):
+ 	requires_filesystem_watcher = hasattr(obj, 'powerline_requires_filesystem_watcher')
+ 
+ 	for name, method in argspecobjs:
+-		argspec = getargspec(method)
++		argspec = getfullargspec(method)
+ 		omitted_args = get_omitted_args(name, method)
+ 		largs = len(argspec.args)
+ 		for i, arg in enumerate(reversed(argspec.args)):
+@@ -60,4 +61,31 @@ def getconfigargspec(obj):
+ 				if arg not in args:
+ 					args.insert(0, arg)
+ 
+-	return ArgSpec(args=args, varargs=None, keywords=None, defaults=tuple(defaults))
++	return FullArgSpec(args=args, varargs=None, varkw=None, defaults=tuple(defaults), kwonlyargs=(), kwonlydefaults={}, annotations={})
++
++
++def formatconfigargspec(args, varargs=None, varkw=None, defaults=None,
++                        kwonlyargs=(), kwonlydefaults={}, annotations={},
++                        formatvalue=lambda value: '=' + repr(value)):
++	'''Format an argument spec from the values returned by getconfigargspec.
++
++	This is a specialized replacement for inspect.formatargspec, which has been
++	deprecated since Python 3.5 and was removed in Python 3.11. It supports
++	valid values for args, defaults and formatvalue; all other parameters are
++	expected to be either empty or None.
++	'''
++	assert varargs is None
++	assert varkw is None
++	assert not kwonlyargs
++	assert not kwonlydefaults
++	assert not annotations
++
++	specs = []
++	if defaults:
++		firstdefault = len(args) - len(defaults)
++	for i, arg in enumerate(args):
++		spec = arg
++		if defaults and i >= firstdefault:
++			spec += formatvalue(defaults[i - firstdefault])
++		specs.append(spec)
++	return '(' + ', '.join(specs) + ')'
+-- 
+2.36.1
+
diff --git a/powerline.spec b/powerline.spec
index 3527a17..4527ada 100644
--- a/powerline.spec
+++ b/powerline.spec
@@ -2,7 +2,7 @@
 
 Name:           powerline
 Version:        2.8.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        The ultimate status-line/prompt utility
 License:        MIT
@@ -32,6 +32,9 @@ Recommends:     python3-pygit2
 Source0:        https://github.com/powerline/powerline/archive/%{version}/powerline-%{version}.tar.gz
 Source1:        vim-powerline.metainfo.xml
 
+# Fix build error with Python 3.11 (#2022396)
+Patch0:         0001-Ensure-compatibility-with-Python-3.11.patch
+
 %description
 Powerline is a status-line plugin for vim, and provides status-lines and prompts
 for several other applications, including zsh, bash, tmux, IPython, Awesome and
@@ -331,6 +334,9 @@ install -m 0644 powerline/dist/systemd/powerline-daemon.service %{buildroot}%{_u
 %{_datadir}/tmux/powerline*.conf
 
 %changelog
+* Thu Jun 23 2022 Christoph Erhardt <fedora@sicherha.de> - 2.8.3-6
+- Fix build error with Python 3.11 (#2022396)
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.8.3-5
 - Rebuilt for Python 3.11