From e3f301dbe1dbba168660d7e2553c5c356b2be30d Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Mon, 25 Mar 2013 21:04:48 +0100
Subject: [PATCH] Correction de conflits d'imports

---
 songbook.py       |  2 +-
 utils/__init__.py | 13 +++++++++++++
 utils/utils.py    | 13 -------------
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 utils/utils.py

diff --git a/songbook.py b/songbook.py
index 8851509a..74e5905e 100755
--- a/songbook.py
+++ b/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\\{)(.(?<!\\}]))+')
diff --git a/utils/__init__.py b/utils/__init__.py
index e69de29b..576c66b2 100644
--- a/utils/__init__.py
+++ b/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
diff --git a/utils/utils.py b/utils/utils.py
deleted file mode 100644
index 576c66b2..00000000
--- a/utils/utils.py
+++ /dev/null
@@ -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