summaryrefslogtreecommitdiff
path: root/dev-util/kdevelop-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/kdevelop-python')
-rw-r--r--dev-util/kdevelop-python/Manifest2
-rw-r--r--dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch190
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild (renamed from dev-util/kdevelop-python/kdevelop-python-24.05.0.ebuild)2
3 files changed, 193 insertions, 1 deletions
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 56e1ca34608d..31f45937caa2 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,2 +1,2 @@
DIST kdev-python-24.02.2.tar.xz 1098808 BLAKE2B 3019ef98788699eb9c5b3168656f73cfcd29c54134ca6d23831d70dd318e4b0dee89e7f0e6d4e81b9f446ee5ff92a84f660e117724a7a8b7f1ee3190f4674cfb SHA512 d5b86ce08f7a8ca79bd7f0b65ac1832677b4f0dbb8f2abe3ec7fbcca5a73334a5119c66ab94a22747802312cf717dd99b622243c1c18c55dcbafadba2e33e420
-DIST kdev-python-24.05.0.tar.xz 1098444 BLAKE2B 9941154df5cd5222a3a56d00f249f9fb0c233a5ef10dc280860670e315d4456246bf63e00bb1238c897c8db4a482caffbaabe4b421cd0572691dee635869f911 SHA512 9cf131c0c385882db9177dc3ed4800f3332e8071276cc18c057a4ff0f03128f112765a824bac19b4ca74ccdb40a84676c7c12924096cfd1dab16e0e80ce949ad
+DIST kdev-python-24.05.1.tar.xz 1098416 BLAKE2B c43c92f0606661d2fe2bd05a43f155a90ce40bb42d494cfd3c9ae3a0ff5a4d636440645f88fd5798b7b96454089ef9611dfa22851bd43ad1d85986ce46f077fd SHA512 e35ee5618e746fabe14e62185eb3d19fa7cb54e9cbe8fc8ec9fb1fa0fd938c984a9573408e0bc9993bd04b66ba5bd3274ddbb722835dff760d4626e42c30612e
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
new file mode 100644
index 000000000000..00507fc0de7e
--- /dev/null
+++ b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
@@ -0,0 +1,190 @@
+From 26ee370982e7cd7795921e9533b61a5a89d11b6a Mon Sep 17 00:00:00 2001
+From: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Sat, 8 Jun 2024 16:50:47 +0200
+Subject: [PATCH] initial support for python 3.12
+
+---
+ CMakeLists.txt | 2 +-
+ duchain/tests/pyduchaintest.cpp | 5 +++++
+ parser/ast.cpp | 3 +++
+ parser/ast.h | 6 ++++++
+ parser/astbuilder.cpp | 15 +++++++++++++--
+ parser/asttransformer.cpp | 6 ++++++
+ parser/astvisitor.cpp | 1 +
+ parser/python_grammar.h | 15 +++++++++++++++
+ 8 files changed, 50 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fba20c3..29b83950 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_definitions( -DTRANSLATION_DOMAIN=\"kdevpython\" )
+
+ set(Python3_USE_STATIC_LIBS FALSE)
+ set(Python3_FIND_STRATEGY VERSION)
+-find_package(Python3 3.4.3...<3.12 COMPONENTS Interpreter Development REQUIRED)
++find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED)
+
+ configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
+
+diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
+index b0711fd0..8a4a75e4 100644
+--- a/duchain/tests/pyduchaintest.cpp
++++ b/duchain/tests/pyduchaintest.cpp
+@@ -439,6 +439,11 @@ void PyDUChainTest::testCrashes_data() {
+ #if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
+ QTest::newRow("except_star") << "try: pass\nexcept* (IndexError, ValueError): pass";
+ #endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++ QTest::newRow("type_alias") << "type Point = tuple[float, float]";
++ QTest::newRow("generic_function") << "def func[T](arg: T): pass";
++ QTest::newRow("generic_class") << "class Bag[T]: pass";
++#endif
+ }
+
+ void PyDUChainTest::testClassVariables()
+diff --git a/parser/ast.cpp b/parser/ast.cpp
+index a63ac231..4a371b10 100644
+--- a/parser/ast.cpp
++++ b/parser/ast.cpp
+@@ -765,6 +765,9 @@ QString TryAst::dump() const
+ return r;
+ }
+
++TypeAliasAst::TypeAliasAst(Ast* parent): StatementAst(parent, Ast::TypeAliasType)
++{
++}
+
+ WhileAst::WhileAst(Ast* parent): StatementAst(parent, Ast::WhileAstType), condition(nullptr)
+ {
+diff --git a/parser/ast.h b/parser/ast.h
+index 430b70d6..acaf79f7 100644
+--- a/parser/ast.h
++++ b/parser/ast.h
+@@ -137,6 +137,7 @@ public:
+ ExceptionHandlerAstType,
+ AliasAstType, // for imports
+ IdentifierAstType,
++ TypeAliasType, // for types
+ LastAstType // the largest one, not valid!
+ };
+
+@@ -437,6 +438,11 @@ public:
+ QList<Ast*> finally;
+ };
+
++class KDEVPYTHONPARSER_EXPORT TypeAliasAst : public StatementAst {
++public:
++ TypeAliasAst(Ast* parent);
++};
++
+ class KDEVPYTHONPARSER_EXPORT ImportAst : public StatementAst {
+ public:
+ ImportAst(Ast* parent);
+diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
+index 9c9ec056..32ab95c7 100644
+--- a/parser/astbuilder.cpp
++++ b/parser/astbuilder.cpp
+@@ -57,7 +57,16 @@ struct PythonParser : private QMutexLocker
+
+ PythonParser(QMutex& lock): QMutexLocker(&lock)
+ {
++#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
+ Py_InitializeEx(0);
++#else
++ PyConfig config;
++ PyConfig_InitPythonConfig(&config);
++ config.site_import = 0;
++ config.install_signal_handlers = 0;
++ Py_InitializeFromConfig(&config);
++#endif
++
+ Q_ASSERT(Py_IsInitialized());
+ m_parser_mod = PyImport_ImportModule("ast");
+ Q_ASSERT(m_parser_mod); // parser import error
+@@ -92,9 +101,11 @@ struct PythonParser : private QMutexLocker
+ CodeAst::Ptr AstBuilder::parse(const QUrl& filename, QString &contents)
+ {
+ qCDebug(KDEV_PYTHON_PARSER) << " ====> AST ====> building abstract syntax tree for " << filename.path();
+-
++
++#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
+ Py_NoSiteFlag = 1;
+-
++#endif
++
+ contents.append('\n');
+
+ PythonParser py_parser(pyInitLock);
+diff --git a/parser/asttransformer.cpp b/parser/asttransformer.cpp
+index 3884ae13..0c54a498 100644
+--- a/parser/asttransformer.cpp
++++ b/parser/asttransformer.cpp
+@@ -1246,6 +1246,12 @@ Ast* AstTransformer::visitStmtNode(PyObject* node, Ast* parent)
+ }
+ result = v;
+ }
++#endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++ else if (PyObject_IsInstance(node, grammar.ast_TypeAlias)) {
++ TypeAliasAst* v = new TypeAliasAst(parent);
++ result = v;
++ }
+ #endif
+ else {
+ qWarning() << "Unsupported _stmt AST type: " << PyUnicodeObjectToQString(PyObject_Str(node));
+diff --git a/parser/astvisitor.cpp b/parser/astvisitor.cpp
+index eda66000..df21cddf 100644
+--- a/parser/astvisitor.cpp
++++ b/parser/astvisitor.cpp
+@@ -104,6 +104,7 @@ void AstVisitor::visitNode(Ast* node)
+ case Ast::LastStatementType: Q_ASSERT(false); break;
+ case Ast::LastExpressionType: Q_ASSERT(false); break;
+ case Ast::LastPatternType: Q_ASSERT(false); break;
++ case Ast::TypeAliasType: break;
+ }
+ }
+
+diff --git a/parser/python_grammar.h b/parser/python_grammar.h
+index 1b30be49..88c68f70 100644
+--- a/parser/python_grammar.h
++++ b/parser/python_grammar.h
+@@ -45,6 +45,10 @@ public:
+ PyObject* ast_Pass;
+ PyObject* ast_Break;
+ PyObject* ast_Continue;
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++ // type
++ PyObject* ast_TypeAlias;
++#endif
+
+ // expr
+ PyObject* ast_expr;
+@@ -330,6 +334,10 @@ public:
+ Py_GRAMMAR_GET(mod, Bytes);
+ #endif
+
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++ Py_GRAMMAR_GET(mod, TypeAlias);
++#endif
++
+ Py_DECREF(mod);
+ }
+
+@@ -472,6 +480,13 @@ public:
+ Py_XDECREF(ast_Str);
+ Py_XDECREF(ast_Bytes);
+ #endif
++
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
++ Py_XDECREF(ast_TryStar);
++#endif
++#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
++ Py_XDECREF(ast_TypeAlias);
++#endif
+ }
+ };
+
+--
+GitLab
+
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.05.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
index 947400015e7c..ff6f9f580307 100644
--- a/dev-util/kdevelop-python/kdevelop-python-24.05.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-24.05.1.ebuild
@@ -45,6 +45,8 @@ RDEPEND="${DEPEND}
')
"
+PATCHES=( "${FILESDIR}/${P}-python3.12.patch" ) # bug 929546
+
pkg_setup() {
python-single-r1_pkg_setup
ecm_pkg_setup
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-02 16:42:59 +0000