From 52d3bfa54f5baf9f4371f747306a55911ed1348e Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 1 Jun 2018 14:55:10 +0200
Subject: [PATCH] Change the shebang line from python2 to python3 for all
 scripts

---
 src/filters/ppt-dump.py               | 2 +-
 src/filters/rcl7z                     | 2 +-
 src/filters/rclaudio                  | 2 +-
 src/filters/rcldia                    | 2 +-
 src/filters/rcldjvu.py                | 2 +-
 src/filters/rcldoc.py                 | 2 +-
 src/filters/rclepub                   | 2 +-
 src/filters/rclepub1                  | 2 +-
 src/filters/rclics                    | 2 +-
 src/filters/rclimg.py                 | 2 +-
 src/filters/rclinfo                   | 2 +-
 src/filters/rclkar                    | 2 +-
 src/filters/rcllatinclass.py          | 2 +-
 src/filters/rclopxml.py               | 2 +-
 src/filters/rclpdf.py                 | 2 +-
 src/filters/rclppt.py                 | 4 +---
 src/filters/rclpython                 | 2 +-
 src/filters/rclrar                    | 2 +-
 src/filters/rclrtf.py                 | 2 +-
 src/filters/rclsoff-flat.py           | 2 +-
 src/filters/rclsoff.py                | 2 +-
 src/filters/rclsvg.py                 | 2 +-
 src/filters/rcltar                    | 2 +-
 src/filters/rcltext.py                | 2 +-
 src/filters/rcltxtlines.py            | 2 +-
 src/filters/rcluncomp.py              | 2 +-
 src/filters/rclwar                    | 2 +-
 src/filters/rclxls.py                 | 4 +---
 src/filters/rclxml.py                 | 2 +-
 src/filters/rclxmp.py                 | 2 +-
 src/filters/rclzip                    | 2 +-
 src/filters/xls-dump.py               | 2 +-
 src/filters/xlsxmltocsv.py            | 2 +-
 src/python/recoll/recoll/rclconfig.py | 2 +-
 34 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/filters/ppt-dump.py b/src/filters/ppt-dump.py
index f41a9f39..54e26ce1 100755
--- a/src/filters/ppt-dump.py
+++ b/src/filters/ppt-dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/filters/rcl7z b/src/filters/rcl7z
index c68c8bcb..c27c2314 100755
--- a/src/filters/rcl7z
+++ b/src/filters/rcl7z
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # 7-Zip file filter for Recoll
 
diff --git a/src/filters/rclaudio b/src/filters/rclaudio
index 94ca0be7..6d183c21 100755
--- a/src/filters/rclaudio
+++ b/src/filters/rclaudio
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Audio tag filter for Recoll, using mutagen
 
diff --git a/src/filters/rcldia b/src/filters/rcldia
index 282148eb..363c9cc2 100755
--- a/src/filters/rcldia
+++ b/src/filters/rcldia
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
diff --git a/src/filters/rcldjvu.py b/src/filters/rcldjvu.py
index c5397195..b8015d2f 100755
--- a/src/filters/rcldjvu.py
+++ b/src/filters/rcldjvu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2016 J.F.Dockes
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rcldoc.py b/src/filters/rcldoc.py
index e8fa1831..d6bd06fe 100755
--- a/src/filters/rcldoc.py
+++ b/src/filters/rcldoc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import rclexecm
diff --git a/src/filters/rclepub b/src/filters/rclepub
index ae28defd..735a5d6a 100755
--- a/src/filters/rclepub
+++ b/src/filters/rclepub
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """Extract Html content from an EPUB file (.epub)"""
 from __future__ import print_function
 
diff --git a/src/filters/rclepub1 b/src/filters/rclepub1
index 3d410ec5..593bb95a 100755
--- a/src/filters/rclepub1
+++ b/src/filters/rclepub1
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """Extract Html content from an EPUB file (.chm), concatenating all sections"""
 from __future__ import print_function
 
diff --git a/src/filters/rclics b/src/filters/rclics
index 0ef04f2d..592b645d 100755
--- a/src/filters/rclics
+++ b/src/filters/rclics
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 from __future__ import print_function
 
 # Read an ICS file, break it into "documents" which are events, todos,
diff --git a/src/filters/rclimg.py b/src/filters/rclimg.py
index 7eb1da91..6c7eb8fb 100755
--- a/src/filters/rclimg.py
+++ b/src/filters/rclimg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Python-based Image Tag extractor for Recoll. This is less thorough
 # than the Perl-based rclimg script, but useful if you don't want to
diff --git a/src/filters/rclinfo b/src/filters/rclinfo
index f353d19e..ebd611e5 100755
--- a/src/filters/rclinfo
+++ b/src/filters/rclinfo
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Read a file in GNU info format and output its nodes as subdocs,
 # interfacing with recoll execm
diff --git a/src/filters/rclkar b/src/filters/rclkar
index d6570dd5..c54ec7bc 100755
--- a/src/filters/rclkar
+++ b/src/filters/rclkar
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Read a .kar midi karaoke file and translate to recoll indexable format
 # This does not work with Python3 yet because python:midi doesn't 
diff --git a/src/filters/rcllatinclass.py b/src/filters/rcllatinclass.py
index 3f8b8634..c3612810 100755
--- a/src/filters/rcllatinclass.py
+++ b/src/filters/rcllatinclass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """Try to guess a text's language and character set by checking how it matches lists of
 common words. This is not a primary method of detection because it's slow and unreliable, but it
 may be a help in discrimating, for exemple, before european languages using relatively close
diff --git a/src/filters/rclopxml.py b/src/filters/rclopxml.py
index b7f7fe83..277d0a03 100755
--- a/src/filters/rclopxml.py
+++ b/src/filters/rclopxml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2015 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclpdf.py b/src/filters/rclpdf.py
index 1e6852ea..b3715b54 100755
--- a/src/filters/rclpdf.py
+++ b/src/filters/rclpdf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclppt.py b/src/filters/rclppt.py
index a4e50265..684b8907 100755
--- a/src/filters/rclppt.py
+++ b/src/filters/rclppt.py
@@ -1,8 +1,6 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Recoll PPT text extractor
-# Mso-dumper is not compatible with Python3. We use sys.executable to
-# start the actual extractor, so we need to use python2 too.
 
 from __future__ import print_function
 
diff --git a/src/filters/rclpython b/src/filters/rclpython
index 615455b3..58a7d847 100755
--- a/src/filters/rclpython
+++ b/src/filters/rclpython
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: iso-8859-1 -*-
 """
     MoinMoin - Python source parser and colorizer
diff --git a/src/filters/rclrar b/src/filters/rclrar
index 8f723fa5..89b08749 100755
--- a/src/filters/rclrar
+++ b/src/filters/rclrar
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Rar file filter for Recoll
 # Adapted from the Zip archive filter by mroark.
diff --git a/src/filters/rclrtf.py b/src/filters/rclrtf.py
index e4b56d54..e5652440 100755
--- a/src/filters/rclrtf.py
+++ b/src/filters/rclrtf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import rclexecm
diff --git a/src/filters/rclsoff-flat.py b/src/filters/rclsoff-flat.py
index 337a5f94..9101fb33 100755
--- a/src/filters/rclsoff-flat.py
+++ b/src/filters/rclsoff-flat.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclsoff.py b/src/filters/rclsoff.py
index 5730d97c..f3b3cdd5 100755
--- a/src/filters/rclsoff.py
+++ b/src/filters/rclsoff.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclsvg.py b/src/filters/rclsvg.py
index 8c1b8aea..e084e305 100755
--- a/src/filters/rclsvg.py
+++ b/src/filters/rclsvg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rcltar b/src/filters/rcltar
index d8bf100d..80f7bda9 100755
--- a/src/filters/rcltar
+++ b/src/filters/rcltar
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Tar-file filter for Recoll
 # Thanks to Recoll user Martin Ziegler
diff --git a/src/filters/rcltext.py b/src/filters/rcltext.py
index 77359ff6..4ad7d9d2 100755
--- a/src/filters/rcltext.py
+++ b/src/filters/rcltext.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Wrapping a text file. Recoll does it internally in most cases, but
 # this is for use by another filter.
diff --git a/src/filters/rcltxtlines.py b/src/filters/rcltxtlines.py
index 220151fd..3a657e1a 100755
--- a/src/filters/rcltxtlines.py
+++ b/src/filters/rcltxtlines.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """Index text lines as document (execm handler sample). This exists
 to demonstrate the execm interface and is not meant to be useful or
 efficient"""
diff --git a/src/filters/rcluncomp.py b/src/filters/rcluncomp.py
index 32a11c1a..fbfb854c 100644
--- a/src/filters/rcluncomp.py
+++ b/src/filters/rcluncomp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import rclexecm
diff --git a/src/filters/rclwar b/src/filters/rclwar
index b654f3b3..a79cfa3d 100755
--- a/src/filters/rclwar
+++ b/src/filters/rclwar
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # WAR web archive filter for recoll. War file are gzipped tar files
 
diff --git a/src/filters/rclxls.py b/src/filters/rclxls.py
index c7b2343a..ec8ad6a5 100755
--- a/src/filters/rclxls.py
+++ b/src/filters/rclxls.py
@@ -1,8 +1,6 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 # Extractor for Excel files.
-# Mso-dumper is not compatible with Python3. We use sys.executable to
-# start the actual extractor, so we need to use python2 too.
 
 import rclexecm
 import rclexec1
diff --git a/src/filters/rclxml.py b/src/filters/rclxml.py
index 33ae8e3e..b6728f59 100755
--- a/src/filters/rclxml.py
+++ b/src/filters/rclxml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclxmp.py b/src/filters/rclxmp.py
index 158e1222..6cf1b77b 100755
--- a/src/filters/rclxmp.py
+++ b/src/filters/rclxmp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2016 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/rclzip b/src/filters/rclzip
index 35739625..e7e807e6 100755
--- a/src/filters/rclzip
+++ b/src/filters/rclzip
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2014 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/filters/xls-dump.py b/src/filters/xls-dump.py
index abffa330..a27da02d 100755
--- a/src/filters/xls-dump.py
+++ b/src/filters/xls-dump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/filters/xlsxmltocsv.py b/src/filters/xlsxmltocsv.py
index 0c9a5047..3aefcaea 100755
--- a/src/filters/xlsxmltocsv.py
+++ b/src/filters/xlsxmltocsv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # Copyright (C) 2015 J.F.Dockes
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
diff --git a/src/python/recoll/recoll/rclconfig.py b/src/python/recoll/recoll/rclconfig.py
index 7bbca274..2e11b3ee 100755
--- a/src/python/recoll/recoll/rclconfig.py
+++ b/src/python/recoll/recoll/rclconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import locale