From c7e65d003c63aacc603e84d3a2d1e0b7ef77be42 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Mon, 13 Jun 2016 07:56:38 +0200 Subject: [PATCH 1/3] [bug] tex content only includes the first item --- test/test_content/tex.control | 1 + test/test_content/tex.source | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_content/tex.control b/test/test_content/tex.control index 0c187461..47d8fe2c 100644 --- a/test/test_content/tex.control +++ b/test/test_content/tex.control @@ -1,2 +1,3 @@ - test/test_content/datadir/songs/texfile.tex +- test/test_content/datadir/songs/texfile.tex - test/test_content/datadir/songs/texfile.tex \ No newline at end of file diff --git a/test/test_content/tex.source b/test/test_content/tex.source index 9cbed25b..959a2f46 100644 --- a/test/test_content/tex.source +++ b/test/test_content/tex.source @@ -1,4 +1,4 @@ - tex: - texfile.tex - - chordpro.csg + - texfile.tex - tex: texfile.tex \ No newline at end of file From 9a98f1d08d95641aa422f0667fdd5e8721897437 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Mon, 13 Jun 2016 07:59:32 +0200 Subject: [PATCH 2/3] bugfix: use a list instead of an iterator --- patacrep/content/tex.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/patacrep/content/tex.py b/patacrep/content/tex.py index adf6950e..8f2ebcb9 100755 --- a/patacrep/content/tex.py +++ b/patacrep/content/tex.py @@ -43,9 +43,8 @@ def parse(keyword, argument, config): argument = [argument] filelist = ContentList() - basefolders = itertools.chain( - (path.fullpath for path in config['_songdir']), - files.iter_datadirs(config['_datadir'], 'latex'), + basefolders = [path.fullpath for path in config['_songdir']] + list( + files.iter_datadirs(config['_datadir'], 'latex') ) for filename in argument: checked_file = None From 72b826531de6989410e18438b45b093be3da6ff3 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Mon, 13 Jun 2016 08:06:08 +0200 Subject: [PATCH 3/3] [pylint] unused import --- patacrep/content/tex.py | 1 - 1 file changed, 1 deletion(-) diff --git a/patacrep/content/tex.py b/patacrep/content/tex.py index 8f2ebcb9..b00f3539 100755 --- a/patacrep/content/tex.py +++ b/patacrep/content/tex.py @@ -1,6 +1,5 @@ """Include LaTeX raw code in the songbook.""" -import itertools import logging import os