From 1c1a0e6113a694c289a17e24c2b38b6492dc99f0 Mon Sep 17 00:00:00 2001
From: Laurent Bachelier <laurent@bachelier.name>
Date: Sun, 22 Apr 2018 20:51:00 +0200
Subject: [PATCH] pyflakes: Stricter matching and simpler config

---
 tools/py3-compatible.modules | 220 +++++++++++++++++------------------
 tools/pyflakes.sh            |   6 +-
 tools/weboob_lint.py         |   2 +-
 3 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/tools/py3-compatible.modules b/tools/py3-compatible.modules
index 9086df541b..33827eac2b 100644
--- a/tools/py3-compatible.modules
+++ b/tools/py3-compatible.modules
@@ -1,113 +1,113 @@
 ##
 # this file declares which modules are compatible with python3 and should be checked with pyflakes3
 ##
-750g/
-adecco/
-agendaculturel/
-agendadulibre/
-allrecipes/
-amazon/
-americanexpress/
-apec/
-arte/
-axabanque/
-bandcamp/
-banquepopulaire/
-barclays/
-bforbank/
-bibliothequesparis/
-billetreduc/
-biplan/
-blablacar/
-blogspot/
-bnppere/
-boursorama/
-/bp/
-bred/
-btmon/
-caissedepargne/
-capeasi/
-colissimo/
-cragr/
-creditcooperatif/
-creditdunord/
-cuisineaz/
-delubac/
-dlfp/
-ebonics/
-entreparticuliers/
-erehsbc/
-esalia/
-explorimmo/
-feedly/
-fortuneo/
-francetelevisions/
-freeteknomusic/
-funmooc/
-github/
-googletranslate/
-groupamaes/
-hsbc/
-hybride/
-imdb/
-imgur/
-indeed/
-infomaniak/
-ing/
-ipinfodb/
-jcvelaux/
-jirafeau/
-lameteoagricole/
-larousse/
-lcl/
-ldlc/
-leboncoin/
-limetorrents/
-linebourse/
-logicimmo/
-lolix/
-lutim/
-lyricsmode/
-manpower/
-marmiton/
-mediawiki/
-meteofrance/
-monster/
-n26/
-nectarine/
-nova/
-opensubtitles/
-ouifm/
-pap/
-pariskiwi/
-paroles2chansons/
-parolesmania/
-pastebin/
-pastealacon/
-pixtoilelibre/
-popolemploi/
-pornhub/
-ratp/
-razibus/
-regionsjob/
-relaiscolis/
-s2e/
-seloger/
-senscritique/
-societegenerale/
-somafm/
-spirica/
-sprunge/
-sueurdemetal/
-supertoinette/
-tumblr/
-tvsubtitles/
-twitter/
-vimeo/
-vlille/
-wordreference/
-xhamster/
-yggtorrents/
-yomoni/
-youtube/
-zerobin/
+750g
+adecco
+agendaculturel
+agendadulibre
+allrecipes
+amazon
+americanexpress
+apec
+arte
+axabanque
+bandcamp
+banquepopulaire
+barclays
+bforbank
+bibliothequesparis
+billetreduc
+biplan
+blablacar
+blogspot
+bnppere
+boursorama
+bp
+bred
+btmon
+caissedepargne
+capeasi
+colissimo
+cragr
+creditcooperatif
+creditdunord
+cuisineaz
+delubac
+dlfp
+ebonics
+entreparticuliers
+erehsbc
+esalia
+explorimmo
+feedly
+fortuneo
+francetelevisions
+freeteknomusic
+funmooc
+github
+googletranslate
+groupamaes
+hsbc
+hybride
+imdb
+imgur
+indeed
+infomaniak
+ing
+ipinfodb
+jcvelaux
+jirafeau
+lameteoagricole
+larousse
+lcl
+ldlc
+leboncoin
+limetorrents
+linebourse
+logicimmo
+lolix
+lutim
+lyricsmode
+manpower
+marmiton
+mediawiki
+meteofrance
+monster
+n26
+nectarine
+nova
+opensubtitles
+ouifm
+pap
+pariskiwi
+paroles2chansons
+parolesmania
+pastebin
+pastealacon
+pixtoilelibre
+popolemploi
+pornhub
+ratp
+razibus
+regionsjob
+relaiscolis
+s2e
+seloger
+senscritique
+societegenerale
+somafm
+spirica
+sprunge
+sueurdemetal
+supertoinette
+tumblr
+tvsubtitles
+twitter
+vimeo
+vlille
+wordreference
+xhamster
+yggtorrents
+yomoni
+youtube
+zerobin
diff --git a/tools/pyflakes.sh b/tools/pyflakes.sh
index d2f4a2378d..d184dba1b6 100755
--- a/tools/pyflakes.sh
+++ b/tools/pyflakes.sh
@@ -3,12 +3,12 @@
 
 err=0
 
-PY3MODS=./tools/py3-compatible.modules
+PY3MODS=$(grep -v '^#' ./tools/py3-compatible.modules|tr '\n' '|'|sed 's/|$//')
 
 cd $(dirname $0)/..
 
-MODULE_FILES=$(git ls-files|grep '^modules/.*\.py$')
-MODULE_FILES3=$(printf "%s\n" $MODULE_FILES|grep -F -f $PY3MODS)
+MODULE_FILES=$(git ls-files modules|grep '\.py$')
+MODULE_FILES3=$(printf "%s\n" $MODULE_FILES|grep -E -w "^modules/(${PY3MODS})")
 
 PYFILES=$(git ls-files | grep '^scripts\|\.py$'|grep -v boilerplate_data|grep -v stable_backport_data|grep -v '^modules'|grep -v '^contrib')
 PYFILES3="$(printf "%s\n" $PYFILES | grep -v /deprecated/) $MODULE_FILES3"
diff --git a/tools/weboob_lint.py b/tools/weboob_lint.py
index 5d697cfa74..d89cb2dbad 100755
--- a/tools/weboob_lint.py
+++ b/tools/weboob_lint.py
@@ -23,7 +23,7 @@
 modules_without_py3 = []
 
 with open(os.path.join(os.path.dirname(__file__), 'py3-compatible.modules')) as p:
-    modules_py3_compatible = [m.strip().strip('/')
+    modules_py3_compatible = [m.strip()
                               for m in p.readlines()
                               if not m.startswith('#')]
 
-- 
GitLab