GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

https://commits.kde.org/kdevelop/37ff587ebe2a2c355d71cb583fb5f058c5301ff3
introduced a pure virtual IDebugSession::killDebuggerNow() member
function. DebugSession must override it to become non-abstract and fix
the following compilation error (GCC):
  invalid new-expression of abstract class type ‘Python::DebugSession’

DebugSession::killDebuggerNow() kills the debugger process
unconditionally to mimic the behavior of ~DebugSession().

As far as I can tell, DebugSession::killDebuggerNow() will never be
called, because DebugSession::stopDebugger() switches to EndedState
synchronously and is destroyed before ~DebugController() invokes
&IDebugSession::killDebuggerNow.

https://commits.kde.org/kdevelop/8552fe7c68eeefa9ef2c2aa2cfebeaefdfbd7c59
made casting of the operator| return value to TopDUContext::Features
redundant => eliminate it.

https://commits.kde.org/kdevelop/08a82a9cfaf30657eae9ebb71de8fcb6dcfd7432
renamed TopDUContext's enum Features to Feature and added
QFlags<Feature> Features => introduce a constexpr features variable in
ParseJob::run() to change the type of the first operator| argument from
Feature to Features and thus fix the following compilation error (GCC):
  invalid user-defined conversion from ‘QIncompatibleFlag’ to ‘KDevelop::TopDUContext::Feature’ [-fpermissive]

KDevelop uses this standard since
https://commits.kde.org/kdevelop/f2925b5c6dc258def26c5f6d6d11433f896452c1

Its plugins must follow suit or they won't compile once C++17 features
make it into kdevplatform headers.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 426292
FIXED-IN: 5.6.1

The dimensions of an ExtSlice node are _slice nodes rather than _expr,
 so this would crash whenever encountering one.

 --

This was introduced in commit 05e95cac "Initial support for CPython 3.9".

When I replaced `SliceAst` with `ExpressionAst` in the relevant line
 of python39.sdef, conversionGenerator.py *also* changed `_slice` to `_expr` here
 (because the type used is implicitly determined in a stupid way)
 and I failed to notice that difference in the newly-generated code.

I couldn't see an easy way to fix the implicit type thing, so this commit just
 bypasses that mechanism and uses CODE instead.

CCBUG:426292

GIT_SILENT

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

This reformats our AST to match that introduced upstream by
 https://bugs.python.org/issue34822 and adjusts the conversion from
 older Python versions' AST to match.

ExtendedSliceAst is removed, in favour of a TupleAst containing
 SliceAsts and/or other expressions.

IndexAst is removed, instead non-slice index expressions are direct
 children of SubscriptAst.

SliceAst and EllipsisAst are now subclasses of ExpressionAst. In the
 latter case I don't understand how it wasn't broken before.

---

The stdlib docfiles are not updated.
 There aren't many changes to builtins in 3.9, but we do need a system to
 re-generate these - perhaps based on Typeshed.

In CPython 3.8 and 3.9 there are several changes to the parser that
 could be useful to us -- particularly end_lineno and end_col_offset.
 This patch doesn't attempt to take advantage of them.

BUG: 419290

These are no longer relevant or used, and potentially confusing.

Otherwise the user gets errors for some new syntax.

e.g. `f'{expr=}'` ->
 "f-string: self documenting expressions are only supported
  in Python 3.8 and greater"