Move templates used ir chordpro conversion

Closer #150

patacrep/songs/chordpro/__init__.py

@@ -48,14 +48,9 @@ class ChordproSong(Song):
             "content": self.cached['song'].content,
             }
 
-        jinjaenv = Environment(loader=ChoiceLoader([
-            FileSystemLoader(
-                self.iter_datadirs("templates", self.output_language)
-            ),
-            FileSystemLoader(
-                pkg_datapath('ast_templates', 'chordpro', self.output_language)
-            ),
-            ]))
+        jinjaenv = Environment(loader=FileSystemLoader(
+            self.iter_datadirs("chordpro", self.output_language)
+            ))
         jinjaenv.filters['search_image'] = self.search_image
         jinjaenv.filters['search_partition'] = self.search_partition
         jinjaenv.filters['lang2babel'] = lang2babel

test/test_chordpro/test_parser.py

@@ -7,7 +7,7 @@ import os
 import unittest
 from pkg_resources import resource_filename
 
-from patacrep import files
+from patacrep import files, __DATADIR__
 from patacrep.build import DEFAULT_CONFIG
 from patacrep.encoding import open_read
 
@@ -41,6 +41,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
         if 'datadir' not in cls.config:
             cls.config['datadir'] = []
         cls.config['datadir'].append(resource_filename(__name__, 'datadir'))
+        cls.config['datadir'].append(__DATADIR__)
 
         cls.song_plugins = files.load_plugins(
             datadirs=cls.config['datadir'],