Blob Blame Raw
From d76c3e37d1212eaa3cac2f293d539bddf9a250f9 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <patrick@monnerat.net>
Date: Mon, 27 May 2019 15:56:31 +0200
Subject: [PATCH 1/2] Switch to Python 3

---
 configure.ac                                          | 2 +-
 plugins/externaltools/externaltools.plugin.desktop.in | 2 +-
 plugins/pythonconsole/pythonconsole.plugin.desktop.in | 2 +-
 plugins/quickopen/quickopen.plugin.desktop.in         | 2 +-
 plugins/snippets/snippets.plugin.desktop.in           | 2 +-
 pluma/pluma-plugins-engine.c                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index ceb9a5c..c381583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@ else
 	have_introspection=no
 fi
 
-AM_PATH_PYTHON([2.7])
+AM_PATH_PYTHON([3.0])
 
 dnl ================================================================
 dnl GSettings related settings
diff --git a/plugins/externaltools/externaltools.plugin.desktop.in b/plugins/externaltools/externaltools.plugin.desktop.in
index b3261e7..b1a7f8b 100644
--- a/plugins/externaltools/externaltools.plugin.desktop.in
+++ b/plugins/externaltools/externaltools.plugin.desktop.in
@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=externaltools
 IAge=2
 _Name=External Tools
diff --git a/plugins/pythonconsole/pythonconsole.plugin.desktop.in b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
index 50d2a7a..4ecbd30 100644
--- a/plugins/pythonconsole/pythonconsole.plugin.desktop.in
+++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=pythonconsole
 IAge=2
 _Name=Python Console
diff --git a/plugins/quickopen/quickopen.plugin.desktop.in b/plugins/quickopen/quickopen.plugin.desktop.in
index 891a0c3..547e430 100644
--- a/plugins/quickopen/quickopen.plugin.desktop.in
+++ b/plugins/quickopen/quickopen.plugin.desktop.in
@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=quickopen
 IAge=2
 _Name=Quick Open
diff --git a/plugins/snippets/snippets.plugin.desktop.in b/plugins/snippets/snippets.plugin.desktop.in
index ea960f3..ba1ecbc 100644
--- a/plugins/snippets/snippets.plugin.desktop.in
+++ b/plugins/snippets/snippets.plugin.desktop.in
@@ -1,5 +1,5 @@
 [Plugin]
-Loader=python
+Loader=python3
 Module=snippets
 IAge=2
 _Name=Snippets
diff --git a/pluma/pluma-plugins-engine.c b/pluma/pluma-plugins-engine.c
index e765b0f..c670e62 100644
--- a/pluma/pluma-plugins-engine.c
+++ b/pluma/pluma-plugins-engine.c
@@ -60,7 +60,7 @@ pluma_plugins_engine_init (PlumaPluginsEngine *engine)
 
 	pluma_debug (DEBUG_PLUGINS);
 
-	peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
+	peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
 
 	engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine,
 	                                            PLUMA_TYPE_PLUGINS_ENGINE,
-- 
2.21.0