Browse Source

Correction de conflits d'imports

remotes/origin/next
Louis 12 years ago
parent
commit
e3f301dbe1
  1. 2
      songbook.py
  2. 13
      utils/__init__.py
  3. 13
      utils/utils.py

2
songbook.py

@ -11,7 +11,7 @@ import shutil
import locale
import platform
from utils.utils import recursiveFind
from utils import recursiveFind
from utils.plastex import parsetex
reTitle = re.compile('(?<=beginsong\\{)(.(?<!\\}]))+')

13
utils/__init__.py

@ -0,0 +1,13 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
import fnmatch
import os
def recursiveFind(root_directory, pattern):
matches = []
for root, dirnames, filenames in os.walk(root_directory):
for filename in fnmatch.filter(filenames, pattern):
matches.append(os.path.join(root, filename))
return matches

13
utils/utils.py

@ -1,13 +0,0 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
import fnmatch
import os
def recursiveFind(root_directory, pattern):
matches = []
for root, dirnames, filenames in os.walk(root_directory):
for filename in fnmatch.filter(filenames, pattern):
matches.append(os.path.join(root, filename))
return matches
Loading…
Cancel
Save