python: remove support of Python 2.x

2026-06-12 14:14:48 +02:00 · 2022-10-15 22:56:06 +02:00
parent 7a544d5fcf
commit 319abf4fd0
44 changed files with 92 additions and 575 deletions
@@ -5,7 +5,7 @@ on:
  - pull_request

 env:
-  WEECHAT_DEPENDENCIES: devscripts equivs python3-pip autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.2-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-dev libsodium-dev pylint python3-bandit asciidoctor ruby-pygments.rb
+  WEECHAT_DEPENDENCIES: devscripts equivs python3-pip autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.2-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-dev libsodium-dev pylint python3-bandit asciidoctor ruby-pygments.rb

 jobs:

@@ -19,7 +19,6 @@ jobs:
          - { name: "cmake_gcc", cc: "gcc", cxx: "g++", tool: "cmake", args: "" }
          - { name: "cmake_gcc_ninja", cc: "gcc", cxx: "g++", tool: "cmake", args: "-G Ninja" }
          - { name: "cmake_gcc_no_nls", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_NLS=OFF" }
-          - { name: "cmake_gcc_py2", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_PYTHON2=ON" }
          - { name: "cmake_gcc_coverage", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_CODE_COVERAGE=ON" }
          - { name: "cmake_clang", cc: "clang", cxx: "clang++", tool: "cmake", args: "" }
          - { name: "autotools_gcc", cc: "gcc", cxx: "g++", tool: "autotools", args: "" }
@@ -105,7 +105,6 @@ option(ENABLE_SCRIPT        "Enable Script plugin (script manager)"       ON)
 option(ENABLE_SCRIPTS       "Enable script plugins (perl, python, ...)"   ON)
 option(ENABLE_PERL          "Enable Perl scripting language"              ON)
 option(ENABLE_PYTHON        "Enable Python scripting language"            ON)
-option(ENABLE_PYTHON2       "Use Python 2 instead of Python 3"            OFF)
 option(ENABLE_RUBY          "Enable Ruby scripting language"              ON)
 option(ENABLE_LUA           "Enable Lua scripting language"               ON)
 option(ENABLE_TCL           "Enable Tcl scripting language"               ON)
@@ -33,6 +33,10 @@ Tests::

  * scripts: add tests on config functions

+Build::
+
+  * python: remove support of Python 2.x
+
 [[v3.7]]
 == Version 3.7 (2022-10-09)

@@ -20,6 +20,12 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 [[v3.8]]
 == Version 3.8 (under dev)

+[[v3.8_remove_python2_support]]
+=== Remove Python 2 support
+
+The CMake option `ENABLE_PYTHON2` and autotools option `--enable-python2`
+have been removed, and WeeChat can not be compiled with Python 2.x any more.
+
 [[v3.8_config_new_option_callbacks]]
 === Callbacks of function config_new_option

@@ -28,11 +28,7 @@
 #  PYTHON_LIBRARIES = path to where libpython.so* can be found
 #  PYTHON_LDFLAGS = python compiler options for linking

-if(ENABLE_PYTHON2)
-  pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
-else()
-  pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
-  if(NOT PYTHON_FOUND)
-    pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
-  endif()
+pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
+if(NOT PYTHON_FOUND)
+  pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
 endif()
@@ -155,7 +155,6 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
-AC_ARG_ENABLE(python2,      [  --enable-python2        use Python 2 instead of Python 3 (default=off)],enable_python2=$enableval,enable_python2=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@@ -467,13 +466,9 @@ fi
 PYTHON_VERSION=

 if test "x$enable_python" = "xyes" ; then
-    if test "x$enable_python2" = "xyes" ; then
-        PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
-    else
-        PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
-        if test "x$PYTHON_FOUND" != "xyes"; then
-            PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
-        fi
+    PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
+    if test "x$PYTHON_FOUND" != "xyes"; then
+        PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
    fi
    if test "x$PYTHON_FOUND" != "xyes" ; then
        AC_MSG_WARN([
@@ -60,8 +60,6 @@

 | php | php_version | Version des verwendeten Interpreters | -

-| python | python2_bin | Pfad zum Python 2.x Interpreter (*veraltet*, seit WeeChat Version 2.6 müssen Skripten Python3 verwenden) | -
-
 | python | python_eval | Evaluierung des Quelltextes | Quelltext welcher ausgeführt werden soll

 | python | python_interpreter | Name des verwendeten Interpreters | -
@@ -144,10 +144,6 @@ Liste ist nicht vollständig):

 |===

-Mit Python 2, das mittlerweile veraltet ist und nicht mehr verwendet werden sollte, ist die
-Zeichenkette die an die Callbacks gesendet wird immer vom Typ `str` und kann deshalb bei den
-oben genannten Fällen, ungültige UTF-8 Daten enthalten.
-
 [[language_perl]]
 ==== Perl

@@ -168,7 +168,7 @@ WeeChat optional sind:
 | gettext                               |          | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch).
 | ca-certificates                       |          | Zertifikate für SSL Verbindungen.
 | libaspell-dev / libenchant-dev        |          | Spell Erweiterung.
-| python3-dev ^(2)^                     |          | Python Erweiterung.
+| python3-dev                           | ≥ 3.0    | Python Erweiterung.
 | libperl-dev                           |          | Perl Erweiterung.
 | ruby2.7, ruby2.7-dev                  | ≥ 1.9.1  | Ruby Erweiterung.
 | liblua5.4-dev                         |          | Lua Erweiterung.
@@ -187,9 +187,7 @@ WeeChat optional sind:

 [NOTE]
 ^(1)^ Der Name stammt von der Debian GNU/Linux Bullseye-Distribution,
-Version und Name können in anderen Distributionen anders lauten. +
-^(2)^ standardmäßig wird Python 3.x verwendet. Wird die Option `+ENABLE_PYTHON2+` aktiviert
-(siehe unten), sollte die Version 2.7 von Python genutzt werden.
+Version und Name können in anderen Distributionen anders lauten.

 Falls eine Debian/Ubuntu basierte Distribution genutzt wird und man einen
 "deb-src" Quelleintrag in _/etc/apt/sources.list_ eingetragen hat, dann ist
@@ -305,9 +303,6 @@ Liste von häufig verwendeten Optionen:
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | kompiliert <<scripting_plugins,Python Erweiterung>>.

-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| kompiliert <<scripting_plugins,Python Erweiterung>> nutzt Python 2 anstelle von Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | kompiliert <<relay,Relay Erweiterung>>.

@@ -60,8 +60,6 @@

 | php | php_version | version of the interpreter used | -

-| python | python2_bin | path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must use Python 3 only) | -
-
 | python | python_eval | evaluation of source code | source code to execute

 | python | python_interpreter | name of the interpreter used | -
@@ -134,10 +134,6 @@ receive a string of type `str` or `bytes` (this list is not exhaustive):

 |===

-In Python 2, which is now deprecated and should not be used any more, the
-strings sent to callbacks are always of type `str`, and may contain invalid
-UTF-8 data, in the cases mentioned above.
-
 [[language_perl]]
 ==== Perl

@@ -161,7 +161,7 @@ WeeChat:
 | gettext                               |          | Internationalization (translation of messages; base language is English).
 | ca-certificates                       |          | Certificates for SSL connections.
 | libaspell-dev / libenchant-dev        |          | Spell plugin.
-| python3-dev ^(2)^                     |          | Python plugin.
+| python3-dev                           | ≥ 3.0    | Python plugin.
 | libperl-dev                           |          | Perl plugin.
 | ruby2.7, ruby2.7-dev                  | ≥ 1.9.1  | Ruby plugin.
 | liblua5.4-dev                         |          | Lua plugin.
@@ -180,9 +180,7 @@ WeeChat:

 [NOTE]
 ^(1)^ Name comes from the Debian GNU/Linux Bullseye distribution, version and
-name can be different in other distributions. +
-^(2)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+`
-(see below), only the version 2.7 of Python is recommended.
+name can be different in other distributions.

 If you are using a Debian/Ubuntu based distribution, and if you have some
 "deb-src" source entries in your file _/etc/apt/sources.list_, you can install
@@ -297,9 +295,6 @@ List of commonly used options:
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | Compile <<scripting_plugins,Python plugin>>.

-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Compile <<scripting_plugins,Python plugin>> using Python 2 instead of Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | Compile <<relay,Relay plugin>>.

@@ -60,8 +60,6 @@

 | php | php_version | version de l'interpréteur utilisé | -

-| python | python2_bin | chemin vers l'interpréteur Python 2.x (*obsolète* depuis la version 2.6, les scripts doivent utiliser seulement Python 3) | -
-
 | python | python_eval | évaluation de code source | code source à exécuter

 | python | python_interpreter | nom de l'interpréteur utilisé | -
@@ -143,10 +143,6 @@ pas exhaustive) :

 |===

-En Python 2, qui est déconseillé et ne devrait plus être utilisé, les chaînes
-envoyées aux fonctions de rappel sont toujours de type `str`, et peuvent contenir
-des données invalides UTF-8, dans les cas mentionnés ci-dessus.
-
 [[language_perl]]
 ==== Perl

@@ -162,7 +162,7 @@ Le tableau suivant liste les paquets optionnels pour compiler WeeChat :
 | gettext                                  |          | Internationalisation (traduction des messages ; la langue de base est l'anglais).
 | ca-certificates                          |          | Certificats pour les connexions SSL.
 | libaspell-dev / libenchant-dev           |          | Extension spell.
-| python3-dev ^(2)^                        |          | Extension python.
+| python3-dev                              | ≥ 3.0    | Extension python.
 | libperl-dev                              |          | Extension perl.
 | ruby2.7, ruby2.7-dev                     | ≥ 1.9.1  | Extension ruby.
 | liblua5.4-dev                            |          | Extension lua.
@@ -182,9 +182,6 @@ Le tableau suivant liste les paquets optionnels pour compiler WeeChat :
 [NOTE]
 ^(1)^ Le nom provient de la distribution GNU/Linux Debian Bullseye, la version
 et le nom peuvent être différents dans les autres distributions.
-^(2)^ Par défaut Python 3.x est utilisé. Si vous activez l'option
-`+ENABLE_PYTHON2+` (voir ci-dessous), seule la version 2.7 de Python est
-recommandée.

 Si vous utilisez une distribution basée sur Debian ou Ubuntu, et si vous avez
 des entrées source "deb-src" dans votre fichier _/etc/apt/sources.list_, vous
@@ -299,10 +296,6 @@ Liste des options couramment utilisées :
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | Compiler <<scripting_plugins,l'extension Python>>.

-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Compiler <<scripting_plugins,l'extension Python>> avec Python 2 au lieu de
-  Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | Compiler <<relay,l'extension Relay>>.

@@ -60,8 +60,6 @@

 | php | php_version | version of the interpreter used | -

-| python | python2_bin | path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must use Python 3 only) | -
-
 | python | python_eval | evaluation of source code | source code to execute

 | python | python_interpreter | name of the interpreter used | -
@@ -147,10 +147,6 @@ receive a string of type `str` or `bytes` (this list is not exhaustive):

 |===

-In Python 2, which is now deprecated and should not be used any more, the
-strings sent to callbacks are always of type `str`, and may contain invalid
-UTF-8 data, in the cases mentioned above.
-
 [[language_perl]]
 ==== Perl

@@ -197,7 +197,7 @@ WeeChat:
 | gettext                               |          | Internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese).
 | ca-certificates                       |          | Certificati per le connessioni SSL.
 | libaspell-dev / libenchant-dev        |          | Plugin spell.
-| python3-dev ^(2)^                     |          | Plugin python.
+| python3-dev                           | ≥ 3.0    | Plugin python.
 | libperl-dev                           |          | Plugin perl.
 | ruby2.7, ruby2.7-dev                  | ≥ 1.9.1  | Plugin ruby.
 | liblua5.4-dev                         |          | Plugin lua.
@@ -222,10 +222,7 @@ WeeChat:
 [NOTE]
 // TRANSLATION MISSING
 ^(1)^ Name comes from the Debian GNU/Linux Bullseye distribution, version and
-name can be different in other distributions. +
-// TRANSLATION MISSING
-^(2)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
-below), only the version 2.7 of Python is recommended.
+name can be different in other distributions.

 // TRANSLATION MISSING
 If you are using a Debian/Ubuntu based distribution, and if you have some
@@ -346,10 +343,6 @@ List of commonly used options:
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | Compile <<scripting_plugins,Python plugin>>.

-// TRANSLATION MISSING
-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Compile <<scripting_plugins,Python plugin>> using Python 2 instead of Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | Compile <<relay,Relay plugin>>.

@@ -60,8 +60,6 @@

 | php | php_version | 使用中のインタプリタのバージョン | -

-| python | python2_bin | path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must use Python 3 only) | -
-
 | python | python_eval | ソースコードの評価 | 実行するソースコード

 | python | python_interpreter | 使用中のインタプリタの名前 | -
@@ -144,10 +144,6 @@ receive a string of type `str` or `bytes` (this list is not exhaustive):

 |===

-In Python 2, which is now deprecated and should not be used any more, the
-strings sent to callbacks are always of type `str`, and may contain invalid
-UTF-8 data, in the cases mentioned above.
-
 [[language_perl]]
 ==== Perl

@@ -180,7 +180,7 @@ WeeChat:
 | gettext                                 |             | 国際化 (メッセージの翻訳; ベース言語は英語です)
 | ca-certificates                         |             | SSL 接続に必要な証明書、relay プラグインで SSL サポート
 | libaspell-dev / libenchant-dev          |             | spell プラグイン
-| python3-dev ^(2)^                       |             | python プラグイン
+| python3-dev                             | 3.0 以上    | python プラグイン
 | libperl-dev                             |             | perl プラグイン
 | ruby2.7, ruby2.7-dev                    | 1.9.1 以上  | ruby プラグイン
 | liblua5.4-dev                           |             | lua プラグイン
@@ -201,10 +201,7 @@ WeeChat:
 [NOTE]
 // TRANSLATION MISSING
 ^(1)^ Name comes from the Debian GNU/Linux Bullseye distribution, version and
-name can be different in other distributions. +
-// TRANSLATION MISSING
-^(2)^ By default Python 3.x is used. If you enable option `+ENABLE_PYTHON2+` (see
-below), only the version 2.7 of Python is recommended.
+name can be different in other distributions.

 Debian および Ubuntu
 ベースのディストリビューションを使っており、_/etc/apt/sources.list_ ファイルで "deb-src"
@@ -320,10 +317,6 @@ CMake に対するオプションを指定するには、以下の書式を使
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | <<scripting_plugins,Python プラグイン>>のコンパイル。

-// TRANSLATION MISSING
-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Compile <<scripting_plugins,Python plugin>> using Python 2 instead of Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | <<relay,リレープラグイン>>のコンパイル。

@@ -60,8 +60,6 @@

 | php | php_version | wersja użytego interpretera | -

-| python | python2_bin | ścieżka do interpretera Pythona 2.x (*przestarzałe* od wersji 2.6 skrypty muszą używać tylko Pythona 3) | -
-
 | python | python_eval | wykonywanie kodu źródłowego | kod źródłowy do wykonania

 | python | python_interpreter | nazwa użytego interpretera | -
@@ -179,7 +179,7 @@ WeeChat:
 | gettext                                 |          | Internacjonalizacja (tłumaczenie wiadomości; język bazowy to Angielski).
 | ca-certificates                         |          | Certyfikaty dla połączeń SSL.
 | libaspell-dev / libenchant-dev          |          | Wtyczka spell.
-| python3-dev ^(2)^                       |          | Wtyczka python.
+| python3-dev                             | ≥ 3.0    | Wtyczka python.
 | libperl-dev                             |          | Wtyczka perl.
 | ruby2.7, ruby2.7-dev                    | ≥ 1.9.1  | Wtyczka ruby.
 | liblua5.4-dev                           |          | Wtyczka lua.
@@ -200,9 +200,7 @@ WeeChat:
 [NOTE]
 // TRANSLATION MISSING
 ^(1)^ Name comes from the Debian GNU/Linux Bullseye distribution, version and
-name can be different in other distributions. +
-^(2)^ Domyślnie używany jest Pythin 3.x. Chyba że włączysz opcję `+ENABLE_PYTHON2+`
-(zobacz niżej), zaleca się uzywania wersji 2.7 Pythona.
+name can be different in other distributions.

 Jeśli używasz dystrybujci bazującej na Debianie/Ubuntu, oraz jeśli posiadasz wpisy
 "deb-src" w pliku _/etc/apt/sources.list_, możesz zainstalować wszytkie zależności
@@ -317,9 +315,6 @@ Lista popularnych opcji:
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | Kompilacja <<scripting_plugins,wtyczki Python>>.

-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Kompilacja <<scripting_plugins,wtyczki Python>> z użyciem Pythona 2 zamiast Pythona 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | Kompilacja <<relay,wtyczki relay>>.

@@ -60,8 +60,6 @@

 | php | php_version | верзија интерпретера која се користи | -

-| python | python2_bin | путања до Python 2.x интерпретера (*застарело* од верзије 2.6, скрипте смеју да користе само Python 3) | -
-
 | python | python_eval | израчунавање изворног кода | изворни кôд који треба да се изврши

 | python | python_interpreter | име интерпретера који се користи | -
@@ -123,8 +123,6 @@ Python стаб за WeeChat API је соступан у репозиториј

 |===

-У Python 2, који је сад превазиђен и више не би требало да се употребљава, стрингови који се шаљу функцијама повратног позива су увек били типа `str`, и у случајевима који су поменути изнад, могли су да садрже неважеће UTF-8 податке.
-
 [[language_perl]]
 ==== Perl

@@ -160,7 +160,7 @@ https://github.com/weechat/weechat-container[weechat-container ^↗^,window=_bl
 | gettext                                |          | Интернационализацију (превод порука; основни језик је енглески).
 | ca-certificates                        |          | Сертификате за SSL везе.
 | libaspell-dev / libenchant-dev         |          | Spell додатак.
-| python3-dev ^(2)^                      |          | Python додатак.
+| python3-dev                            | ≥ 3.0    | Python додатак.
 | libperl-dev                            |          | Perl додатак.
 | ruby2.7, ruby2.7-dev                   | ≥ 1.9.1  | Ruby додатак.
 | liblua5.4-dev                          |          | Lua додатак.
@@ -179,8 +179,7 @@ https://github.com/weechat/weechat-container[weechat-container ^↗^,window=_bl

 [NOTE]
 ^(1)^ Име долази из Debian GNU/Linux Bullseye дистрибуције, верзија и
-име могу да буду другачији у осталим дистрибуцијама. +
-^(2)^ Подразумевано се користи Python 3.x. Ако укључите опцију `+ENABLE_PYTHON2+` (погледајте испод), препоручује се само верзија 2.7 језика Python.
+име могу да буду другачији у осталим дистрибуцијама.

 Ако користите дистрибуцију базирану на Debian/Ubuntu и ако имате неке „deb-src” изворне ставке у фајлу _/etc/apt/sources.list_, можете инсталирати све зависности командом:

@@ -293,9 +292,6 @@ $ make install
 | ENABLE_PYTHON | `ON`, `OFF` | ON
 | Компајлира <<scripting_plugins,Python додатак>>.

-| ENABLE_PYTHON2 | `ON`, `OFF` | OFF
-| Компајлира <<scripting_plugins,Python додатак>> користећи Python 2 уместо Python 3.
-
 | ENABLE_RELAY | `ON`, `OFF` | ON
 | Компајлира <<relay,Relay додатак>>.

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-06-18 16:11+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -11172,11 +11172,6 @@ msgstr "%s%s: nemůžu přesměrovat stdout"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: nemohu přesměrovat stderr"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: nemohu spustit globální interpreter"
@@ -13647,12 +13642,3 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sSelhalo odnastavení volby \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "verze WeeChat"
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-09-29 10:38+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
@@ -12744,12 +12744,6 @@ msgstr ""
 "Ersatzzeichen für Dateinamen, falls der Dateiname Sonderzeichen beinhaltet "
 "(z.B. das Trennzeichen bei Verzeichnissen \"/\")"

-#| msgid ""
-#| "compression of messages sent to clients with \"weechat\" protocol: 0 = "
-#| "disable compression, 1 = low compression / fast ... 100 = best "
-#| "compression / slow; the value is a percentage converted to 1-9 for zlib "
-#| "and 1-19 for zstd; the default value is recommended, it offers a good "
-#| "compromise between compression and speed"
 msgid ""
 "compression level for rotated log files (with extension \".1\", \".2\", "
 "etc.), if option logger.file.rotation_compression_type is enabled: 1 = low "
@@ -12757,16 +12751,12 @@ msgid ""
 "percentage converted to 1-9 for gzip and 1-19 for zstd; the default value is "
 "recommended, it offers a good compromise between compression and speed"
 msgstr ""
-"Komprimierungsstufe für rotierende Protokolldateien (mit Dateierweiterung"
-" „.1“, „.2“,"
-"etc.), falls die Option logger.file.rotation_compression_type aktiviert ist:"
-" 1 = niedrige"
-"Komprimierung / schnell ... 100 = beste Komprimierung / langsam; Der Wert des"
-" Prozentsatzes "
-"wird umgewandelt in 1-9 für gzip und 1-19 für zstd; der Standardwert wird"
-" hierbei"
-"empfohlen, denn er bietet einen guten Kompromiss zwischen Komprimierung und"
-" Geschwindigkeit"
+"Komprimierungsstufe für rotierende Protokolldateien (mit Dateierweiterung "
+"„.1“, „.2“,etc.), falls die Option logger.file.rotation_compression_type "
+"aktiviert ist: 1 = niedrigeKomprimierung / schnell ... 100 = beste "
+"Komprimierung / langsam; Der Wert des Prozentsatzes wird umgewandelt in 1-9 "
+"für gzip und 1-19 für zstd; der Standardwert wird hierbeiempfohlen, denn er "
+"bietet einen guten Kompromiss zwischen Komprimierung und Geschwindigkeit"

 msgid ""
 "compression type for rotated log files; if set to \"none\", rotated log "
@@ -12775,17 +12765,13 @@ msgid ""
 "compress files with the new type (or decompress files), then change the "
 "option in logger.conf, then load the logger plugin"
 msgstr ""
-"Komprimierungstyp für rotierende Protokolldateien; wenn \"none\" genutzt"
-" wird, findet "
-"keine Komprimierung der Protokolldateien statt; WARNUNG: wenn die Rotation"
-" mit einer "
-"anderen Stufe der Komprimierung (oder gar keiner Komprimierung) aktiviert"
-" wurde, "
-"muss zuerst die Logger-Erweiterung beendet werden., dann de-komprimieren Sie"
-" die Dateien "
-"mit dem neuen Typ, danach muss die Option in der Datei logger.conf angepasst"
-" werden, "
-"bevor die Logger-Erweiterung neu geladen wird"
+"Komprimierungstyp für rotierende Protokolldateien; wenn \"none\" genutzt "
+"wird, findet keine Komprimierung der Protokolldateien statt; WARNUNG: wenn "
+"die Rotation mit einer anderen Stufe der Komprimierung (oder gar keiner "
+"Komprimierung) aktiviert wurde, muss zuerst die Logger-Erweiterung beendet "
+"werden., dann de-komprimieren Sie die Dateien mit dem neuen Typ, danach muss "
+"die Option in der Datei logger.conf angepasst werden, bevor die Logger-"
+"Erweiterung neu geladen wird"

 msgid ""
 "when this size is reached, a rotation of log files is performed: the "
@@ -12798,21 +12784,16 @@ msgid ""
 "should first set the compression type via option logger.file."
 "rotation_compression_type"
 msgstr ""
-"Wenn diese Größe erreicht ist, wird eine Rotation der Protokolldateien"
-" durchgeführt: die"
-"vorhandene rotierte Protokolldateien werden umbenannt (.1 wird zu .2, .2 wird"
-" zu .3 usw.)."
-"Die aktuelle Datei erhält wird umbenannt und erhält .1 als Erweiterung; eine"
-" ganze Zahl mit"
-"Suffix ist erlaubt: b = Bytes (Standard, wenn keine Einheit angegeben ist), k"
-" = Kilobytes, m ="
-"Megabyte, g = Gigabyte, t = Terabyte; Beispiel: \"2g\" bewirkt eine Rotation"
-"sobald die Dateigröße > 2.000.000.000 Byte ist; wenn auf „0“ gesetzt, erfolgt"
-" keine Rotation"
-"der Dateien (unbegrenzte Protokollgröße); WARNUNG: Bevor Sie diese Option"
-" ändern,"
-"sollte sie zuerst den Komprimierungstyp über die Option logger.file festlegen."
-"rotation_compression_type"
+"Wenn diese Größe erreicht ist, wird eine Rotation der Protokolldateien "
+"durchgeführt: dievorhandene rotierte Protokolldateien werden umbenannt (.1 "
+"wird zu .2, .2 wird zu .3 usw.).Die aktuelle Datei erhält wird umbenannt und "
+"erhält .1 als Erweiterung; eine ganze Zahl mitSuffix ist erlaubt: b = Bytes "
+"(Standard, wenn keine Einheit angegeben ist), k = Kilobytes, m =Megabyte, g "
+"= Gigabyte, t = Terabyte; Beispiel: \"2g\" bewirkt eine Rotationsobald die "
+"Dateigröße > 2.000.000.000 Byte ist; wenn auf „0“ gesetzt, erfolgt keine "
+"Rotationder Dateien (unbegrenzte Protokollgröße); WARNUNG: Bevor Sie diese "
+"Option ändern,sollte sie zuerst den Komprimierungstyp über die Option logger."
+"file festlegen.rotation_compression_type"

 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
@@ -13540,13 +13521,6 @@ msgstr "%s%s: Standardausgabe (stdout) kann nicht weitergeleitet werden"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: Standardfehlerausgabe (stderr) kann nicht weitergeleitet werden"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-"Pfad zum Python 2.x Interpreter (*veraltet*, seit WeeChat Version 2.6 müssen "
-"Skripten Python3 verwenden)"
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: globaler Interpreter kann nicht gestartet werden"
@@ -15522,8 +15496,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"

 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -15531,8 +15504,7 @@ msgid ""
 "monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
-"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
-"return_code>\" [\"<post_action>\"]]]]]] "
+"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
 "|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
 "<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
 "all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -16431,15 +16403,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr ""
 "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "buflist aktivieren"
-
-#, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sRealname von %s%s%s wurde auf \"%s\" gesetzt"
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "WeeChat-Version"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-06-18 16:11+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: es\n"
@@ -11855,11 +11855,6 @@ msgstr "%s%s: no es posible redirigir la salida stdout"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: no es posible redirigir la salida stderr"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: no es posible iniciar el intérprete global"
@@ -14264,12 +14259,3 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: no es posible conectarse: error (%d)"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sNo se pudo deshacer la opción \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "versión de WeeChat"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-09-28 20:51+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -13245,13 +13245,6 @@ msgstr "%s%s : impossible de rediriger stdout"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s : impossible de rediriger stderr"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-"chemin vers l'interpréteur Python 2.x (*obsolète* depuis la version 2.6, les "
-"scripts doivent utiliser seulement Python 3)"
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s : impossible de lancer l'interpréteur global"
@@ -16101,13 +16094,3 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "activer buflist"
-
-#, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sLe nom réel de %s%s%s a été défini à \"%s\""
-
-#~ msgid "WeeChat session saved"
-#~ msgstr "Session WeeChat sauvegardée"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-04-24 10:20+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: hu\n"
@@ -10629,11 +10629,6 @@ msgstr "Nem sikerült a(z) \"%s\" naplófájlt írni\n"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s nem sikerült a szervert létrehozni\n"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s nem sikerült a szervert létrehozni\n"
@@ -13005,11 +13000,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%s nem sikerült a modul opciókat elmenteni\n"
-
-#, fuzzy
-#~ msgid "WeeChat session saved"
-#~ msgstr "WeeChat szlogen"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-04-24 10:20+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: it\n"
@@ -11651,11 +11651,6 @@ msgstr "%s%s: impossibile reindirizzare stdout"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: impossibile reindirizzare stderr"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: impossibile avviare l'interprete globale"
@@ -14087,12 +14082,3 @@ msgstr "%s%s: timeout per \"%s\" con %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: impossibile connettersi al mittente"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sImpossibile disabilitare l'opzione \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "versione di WeeChat"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-06-18 16:12+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -12628,11 +12628,6 @@ msgstr "%s%s: 標準入力のリダイレクトに失敗"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: 標準エラーのリダイレクトに失敗"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: グローバルインタプリタの起動に失敗"
@@ -15318,15 +15313,3 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "buflist を有効化します"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sオプション \"%s\" の無効化に失敗しました"
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "WeeChat のバージョン"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-06-18 16:12+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -13255,13 +13255,6 @@ msgstr "%s%s: nie można przekierować wyjścia"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: nie można przekierować wyjścia błędu"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-"ścieżka do interpretera Pythona 2.x (*przestarzałe* od wersji 2.6 skrypty "
-"muszą używać tylko Pythona 3)"
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: nie można uruchomić globalnego interpretera"
@@ -16149,15 +16142,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "włącz liste buforów"
-
-#, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sReal name dla %s%s%s zostało zmienione na \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "Wersja WeeChat"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-06-18 16:12+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -12430,11 +12430,6 @@ msgstr "%s%s: não foi possível redirecionar a saída padrão (stdout)"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: não foi possível redirecionar o erro padrão (stderr)"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: não foi possível iniciar o interpretador global"
@@ -15138,12 +15133,3 @@ msgstr "%s%s: tempo limite de \"%s\" com %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar: erro inesperado (%d)"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sFalha ao reinicializar a opção \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "versão do WeeChat"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-04-24 10:20+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pt_BR\n"
@@ -11135,11 +11135,6 @@ msgstr "%s%s: não foi possível redirecionar saída padrão (stdout)"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: não foi possível redirecionar saída de erro (stderr)"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: não foi possível executar interpretador global"
@@ -13531,12 +13526,3 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: não foi possível conectar ao remetente"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sFalhou ao desabilitar a opção \"%s\""
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "versão do WeeChat"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-04-24 10:20+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: ru\n"
@@ -10666,11 +10666,6 @@ msgstr "Не могу записать лог-файл \"%s\"\n"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s не могу создать сервер\n"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s не могу создать сервер\n"
@@ -13039,11 +13034,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #, fuzzy, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s DCC: не могу соединиться с отправителем\n"
-
-#, fuzzy, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
-
-#, fuzzy
-#~ msgid "WeeChat session saved"
-#~ msgstr "слоган WeeChat"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-07-06 08:29+0400\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: sr\n"
@@ -12985,13 +12985,6 @@ msgstr "%s%s: није могуће преусмеравање stdout"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: није могуће преусмеравање stderr"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-"путања до Python 2.x интерпретера (*застарело* од верзије 2.6, скрипте смеју "
-"да користе само Python 3)"
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: није успело покретање глобалног интерпретера"
@@ -15774,15 +15767,3 @@ msgstr "%s%s: тајмаут за „%s” са %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "укључује buflist"
-
-#, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%sРеално име за %s%s%s је постављено на „%s”"
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "верзија програма WeeChat"
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
-"PO-Revision-Date: 2022-07-27 23:00+0300\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
+"PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: tr\n"
@@ -12882,13 +12882,6 @@ msgstr "%s%s: stdout yeniden yönlendirilemiyor"
 msgid "%s%s: unable to redirect stderr"
 msgstr "%s%s: stderr yeniden yönlendirilemiyor"

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-"Python 2.x yorumlayıcısının yolu (2.6 sürümünden bu yana kullanılamaz, "
-"betikler yalnızca Python 3.x kullanmalıdır)"
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr "%s%s: Global yorumlayıcı başlatılamıyor"
@@ -15732,15 +15725,3 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)"
-
-#~ msgid "enable buflist"
-#~ msgstr "buflist'i etkinleştir"
-
-#, c-format
-#~ msgid "%sReal name of %s%s%s has been set to \"%s\""
-#~ msgstr "%s%s%s%s kullanıcısının gerçek adı \"%s\" olarak ayarlandı"
-
-#, fuzzy
-#~| msgid "WeeChat version"
-#~ msgid "WeeChat session saved"
-#~ msgstr "WeeChat sürümü"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-09-28 20:50+0200\n"
+"POT-Creation-Date: 2022-10-15 22:42+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9581,11 +9581,6 @@ msgstr ""
 msgid "%s%s: unable to redirect stderr"
 msgstr ""

-msgid ""
-"path to Python 2.x interpreter (*deprecated* since version 2.6, scripts must "
-"use Python 3 only)"
-msgstr ""
-
 #, c-format
 msgid "%s%s: unable to launch global interpreter"
 msgstr ""
@@ -73,7 +73,6 @@ struct t_plugin_script *python_registered_script = NULL;
 const char *python_current_script_filename = NULL;
 PyThreadState *python_mainThreadState = NULL;
 PyThreadState *python_current_interpreter = NULL;
-char *python2_bin = NULL;
 char **python_buffer_output = NULL;

 /* outputs subroutines */
@@ -83,8 +82,6 @@ static PyMethodDef weechat_python_output_funcs[] = {
    { NULL, NULL, 0, NULL }
 };

-#if PY_MAJOR_VERSION >= 3
-/* module definition for python >= 3.x */
 static struct PyModuleDef moduleDef = {
    PyModuleDef_HEAD_INIT,
    "weechat",
@@ -107,7 +104,6 @@ static struct PyModuleDef moduleDefOutputs = {
    NULL,
    NULL
 };
-#endif /* PY_MAJOR_VERSION >= 3 */

 /*
 * string used to execute action "install":
@@ -134,64 +130,6 @@ char *python_action_remove_list = NULL;
 char *python_action_autoload_list = NULL;


-/*
- * Gets path to python 2.x interpreter.
- *
- * Note: result must be freed after use.
- */
-
-char *
-weechat_python_get_python2_bin ()
-{
-    char *dir_separator, *py2_bin, *path, **paths, bin[4096];
-    char *versions[] = { "2.7", "2.6", "2.5", "2.4", "2.3", "2.2", "2", NULL };
-    int num_paths, i, j, rc;
-    struct stat stat_buf;
-
-    py2_bin = NULL;
-
-    dir_separator = weechat_info_get ("dir_separator", "");
-    path = getenv ("PATH");
-
-    if (dir_separator && path)
-    {
-        paths = weechat_string_split (path, ":", NULL,
-                                      WEECHAT_STRING_SPLIT_STRIP_LEFT
-                                      | WEECHAT_STRING_SPLIT_STRIP_RIGHT
-                                      | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS,
-                                      0, &num_paths);
-        if (paths)
-        {
-            for (i = 0; i < num_paths; i++)
-            {
-                for (j = 0; versions[j]; j++)
-                {
-                    snprintf (bin, sizeof (bin), "%s%s%s%s",
-                              paths[i], dir_separator, "python",
-                              versions[j]);
-                    rc = stat (bin, &stat_buf);
-                    if ((rc == 0) && (S_ISREG(stat_buf.st_mode)))
-                    {
-                        py2_bin = strdup (bin);
-                        break;
-                    }
-                }
-                if (py2_bin)
-                    break;
-            }
-            weechat_string_free_split (paths);
-        }
-    }
-
-    if (dir_separator)
-        free (dir_separator);
-
-    if (!py2_bin)
-        py2_bin = strdup ("python");
-
-    return py2_bin;
-}
-
 /*
 * Converts a python unicode to a C UTF-8 string.
 *
@@ -234,23 +172,16 @@ weechat_python_hashtable_map_cb (void *data,

    dict = (PyObject *)data;

-#if PY_MAJOR_VERSION >= 3
    /* key */
    if (weechat_utf8_is_valid (key, -1, NULL))
-        dict_key = Py_BuildValue ("s", key);  /* Python 3: str */
+        dict_key = Py_BuildValue ("s", key);  /* str */
    else
-        dict_key = Py_BuildValue ("y", key);  /* Python 3: bytes */
+        dict_key = Py_BuildValue ("y", key);  /* bytes */
    /* value */
    if (weechat_utf8_is_valid (value, -1, NULL))
-        dict_value = Py_BuildValue ("s", value);  /* Python 3: str */
+        dict_value = Py_BuildValue ("s", value);  /* str */
    else
-        dict_value = Py_BuildValue ("y", value);  /* Python 3: bytes */
-#else
-    /* key */
-    dict_key = Py_BuildValue ("s", key);  /* Python 2: str */
-    /* value */
-    dict_value = Py_BuildValue ("s", value);  /* Python 2: str */
-#endif
+        dict_value = Py_BuildValue ("y", value);  /* bytes */

    if (dict_key && dict_value)
        PyDict_SetItem (dict, dict_key, dict_value);
@@ -517,14 +448,10 @@ weechat_python_exec (struct t_plugin_script *script,
                {
                    case 's': /* string */
                        argv2[i] = argv[i];
-#if PY_MAJOR_VERSION >= 3
                        if (weechat_utf8_is_valid (argv2[i], -1, NULL))
-                            format2[i] = 's';  /* Python 3: str */
+                            format2[i] = 's';  /* str */
                        else
-                            format2[i] = 'y';  /* Python 3: bytes */
-#else
-                        format2[i] = 's';  /* Python 2: str */
-#endif
+                            format2[i] = 'y';  /* bytes */
                        break;
                    case 'i': /* integer */
                        argv2[i] = PyLong_FromLong ((long)(*((int *)argv[i])));
@@ -679,21 +606,11 @@ end:
 * Initializes the "weechat" module.
 */

-#if PY_MAJOR_VERSION >= 3
 static PyObject *weechat_python_init_module_weechat ()
-#else
-void weechat_python_init_module_weechat ()
-#endif /* PY_MAJOR_VERSION >= 3 */
 {
    PyObject *weechat_module, *weechat_dict;

-#if PY_MAJOR_VERSION >= 3
-    /* python >= 3.x */
    weechat_module = PyModule_Create (&moduleDef);
-#else
-    /* python <= 2.x */
-    weechat_module = Py_InitModule ("weechat", weechat_python_funcs);
-#endif /* PY_MAJOR_VERSION >= 3 */

    if (!weechat_module)
    {
@@ -701,11 +618,7 @@ void weechat_python_init_module_weechat ()
                        weechat_gettext ("%s%s: unable to initialize WeeChat "
                                         "module"),
                        weechat_prefix ("error"), PYTHON_PLUGIN_NAME);
-#if PY_MAJOR_VERSION >= 3
        return NULL;
-#else
-        return;
-#endif /* PY_MAJOR_VERSION >= 3 */
    }

    /* define some constants */
@@ -757,9 +670,7 @@ void weechat_python_init_module_weechat ()
    PyDict_SetItemString (weechat_dict, "WEECHAT_HOOK_SIGNAL_INT", PyUnicode_FromString (WEECHAT_HOOK_SIGNAL_INT));
    PyDict_SetItemString (weechat_dict, "WEECHAT_HOOK_SIGNAL_POINTER", PyUnicode_FromString (WEECHAT_HOOK_SIGNAL_POINTER));

-#if PY_MAJOR_VERSION >= 3
    return weechat_module;
-#endif /* PY_MAJOR_VERSION >= 3 */
 }

 /*
@@ -771,14 +682,7 @@ weechat_python_set_output ()
 {
    PyObject *weechat_outputs;

-#if PY_MAJOR_VERSION >= 3
-    /* python >= 3.x */
    weechat_outputs = PyModule_Create (&moduleDefOutputs);
-#else
-    /* python <= 2.x */
-    weechat_outputs = Py_InitModule ("weechatOutputs",
-                                     weechat_python_output_funcs);
-#endif /* PY_MAJOR_VERSION >= 3 */

    if (weechat_outputs)
    {
@@ -817,9 +721,7 @@ struct t_plugin_script *
 weechat_python_load (const char *filename, const char *code)
 {
    char *argv[] = { "__weechat_plugin__" , NULL };
-#if PY_MAJOR_VERSION >= 3
    wchar_t *wargv[] = { NULL, NULL };
-#endif /* PY_MAJOR_VERSION >= 3 */
    FILE *fp;
    PyObject *python_path, *path, *module_main, *globals, *rc;
    char *weechat_sharedir, *weechat_data_dir;
@@ -853,8 +755,6 @@ weechat_python_load (const char *filename, const char *code)

    /* PyEval_AcquireLock (); */
    python_current_interpreter = Py_NewInterpreter ();
-#if PY_MAJOR_VERSION >= 3
-    /* python >= 3.x */
    len = mbstowcs (NULL, argv[0], 0) + 1;
    wargv[0] = malloc ((len + 1) * sizeof (wargv[0][0]));
    if (wargv[0])
@@ -868,10 +768,6 @@ weechat_python_load (const char *filename, const char *code)
        if (wargv[0])
            free (wargv[0]);
    }
-#else
-    /* python <= 2.x */
-    PySys_SetArgv (1, argv);
-#endif /* PY_MAJOR_VERSION >= 3 */

    if (!python_current_interpreter)
    {
@@ -897,13 +793,7 @@ weechat_python_load (const char *filename, const char *code)
        if (str_sharedir)
        {
            snprintf (str_sharedir, len, "%s/python", weechat_sharedir);
-#if PY_MAJOR_VERSION >= 3
-            /* python >= 3.x */
            path = PyUnicode_FromString (str_sharedir);
-#else
-            /* python <= 2.x */
-            path = PyBytes_FromString (str_sharedir);
-#endif /* PY_MAJOR_VERSION >= 3 */
            if (path != NULL)
            {
                PyList_Insert (python_path, 0, path);
@@ -923,13 +813,7 @@ weechat_python_load (const char *filename, const char *code)
        if (str_home)
        {
            snprintf (str_home, len, "%s/python", weechat_data_dir);
-#if PY_MAJOR_VERSION >= 3
-            /* python >= 3.x */
            path = PyUnicode_FromString (str_home);
-#else
-            /* python <= 2.x */
-            path = PyBytes_FromString (str_home);
-#endif /* PY_MAJOR_VERSION >= 3 */
            if (path != NULL)
            {
                PyList_Insert (python_path, 0, path);
@@ -1429,36 +1313,6 @@ weechat_python_hdata_cb (const void *pointer, void *data,
                                       hdata_name);
 }

-/*
- * Returns python info "python2_bin".
- */
-
-char *
-weechat_python_info_python2_bin_cb (const void *pointer, void *data,
-                                    const char *info_name,
-                                    const char *arguments)
-{
-    int rc;
-    struct stat stat_buf;
-
-    /* make C compiler happy */
-    (void) pointer;
-    (void) data;
-    (void) info_name;
-    (void) arguments;
-
-    if (python2_bin && (strcmp (python2_bin, "python") != 0))
-    {
-        rc = stat (python2_bin, &stat_buf);
-        if ((rc != 0) || (!S_ISREG(stat_buf.st_mode)))
-        {
-            free (python2_bin);
-            python2_bin = weechat_python_get_python2_bin ();
-        }
-    }
-    return (python2_bin) ? strdup (python2_bin) : NULL;
-}
-
 /*
 * Returns python info "python_eval".
 */
@@ -1646,18 +1500,6 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
    if (!python_buffer_output)
        return WEECHAT_RC_ERROR;

-    /*
-     * hook info to get path to python 2.x interpreter
-     * (some scripts using hook_process need that)
-     */
-    python2_bin = weechat_python_get_python2_bin ();
-    weechat_hook_info ("python2_bin",
-                       N_("path to Python 2.x interpreter "
-                          "(*deprecated* since version 2.6, scripts must use "
-                          "Python 3 only)"),
-                       NULL,
-                       &weechat_python_info_python2_bin_cb, NULL, NULL);
-
    PyImport_AppendInittab ("weechat",
                            &weechat_python_init_module_weechat);

@@ -1752,8 +1594,6 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
    }

    /* free some data */
-    if (python2_bin)
-        free (python2_bin);
    if (python_action_install_list)
        free (python_action_install_list);
    if (python_action_remove_list)
@@ -34,13 +34,7 @@
 #define PyUnicode_FromString PyString_FromString
 #endif /* PY_VERSION_HEX < 0x02060000 */

-#if PY_MAJOR_VERSION >= 3
-/* check of integer with Python >= 3.x */
 #define PY_INTEGER_CHECK(x) (PyLong_Check(x))
-#else
-/* check of integer with Python <= 2.x */
-#define PY_INTEGER_CHECK(x) (PyInt_Check(x) || PyLong_Check(x))
-#endif /* PY_MAJOR_VERSION >= 3 */

 extern struct t_weechat_plugin *weechat_python_plugin;

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2017-2022 Sébastien Helleu <flashcode@flashtux.org>
@@ -41,10 +41,7 @@ import argparse
 import ast
 from datetime import datetime
 import inspect
-try:
-    from StringIO import StringIO  # python 2
-except ImportError:
-    from io import StringIO  # python 3
+from io import StringIO
 import os
 import sys
 import traceback
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2017-2022 Sébastien Helleu <flashcode@flashtux.org>
@@ -32,10 +32,7 @@ import ast
 import inspect
 import os
 import select
-try:
-    from StringIO import StringIO  # python 2
-except ImportError:
-    from io import StringIO  # python 3
+from io import StringIO
 import sys

 sys.dont_write_bytecode = True
@@ -148,8 +145,6 @@ class UnparsePython(object):

    def is_number(self, node):  # pylint: disable=no-self-use
        """Check if the node is a number."""
-        # in python 2, number -1 is Num(n=-1)
-        # in Python 3, number -1 is UnaryOp(op=USub(), operand=Num(n=1))
        return (isinstance(node, ast.Num) or
                (isinstance(node, ast.UnaryOp) and
                 isinstance(node.op, (ast.UAdd, ast.USub))))