backport stable

3 files changed, 8 insertions, 7 deletions

diff --git a/fileutils.py b/fileutils.py
index 807f2b5..aacd801 100644
--- a/fileutils.py
+++ b/fileutils.py
@@ -36,7 +36,7 @@ from cStringIO import StringIO
 
 from logilab.common import STD_BLACKLIST as BASE_BLACKLIST, IGNORED_EXTENSIONS
 from logilab.common.shellutils import find
-from logilab.common.compat import FileIO
+from logilab.common.compat import FileIO, any
 
 def first_level_directory(path):
     """Return the first level directory of a path.
@@ -377,7 +377,8 @@ def export(from_dir, to_dir,
                     mkdir(dest)
         for filename in filenames:
             # don't include binary files
-            if filename.endswith(ignore_ext):
+            # endswith does not accept tuple in 2.4
+            if any(filename.endswith(ext) for ext in ignore_ext):
                 continue
             src = join(directory, filename)
             dest = to_dir + src[len(from_dir):]
diff --git a/test/unittest_fileutils.py b/test/unittest_fileutils.py
index d900b3f..b76196f 100644
--- a/test/unittest_fileutils.py
+++ b/test/unittest_fileutils.py
@@ -25,7 +25,7 @@ from logilab.common.testlib import TestCase, unittest_main, unittest
 
 from logilab.common.fileutils import *
 
-DATA_DIR = 'data'
+DATA_DIR = join(os.path.abspath(os.path.dirname(__file__)), 'data')
 NEWLINES_TXT = join(DATA_DIR,'newlines.txt')
 
 
@@ -72,7 +72,7 @@ class ExportTC(TestCase):
         os.mkdir(self.tempdir)
 
     def test(self):
-        export('data', self.tempdir, verbose=0)
+        export(DATA_DIR, self.tempdir, verbose=0)
         self.assert_(exists(join(self.tempdir, '__init__.py')))
         self.assert_(exists(join(self.tempdir, 'sub')))
         self.assert_(not exists(join(self.tempdir, '__init__.pyc')))
@@ -83,8 +83,8 @@ class ExportTC(TestCase):
 
 class ProtectedFileTC(TestCase):
     def setUp(self):
-        self.rpath = 'data/write_protected_file.txt'
-        self.rwpath = 'data/normal_file.txt'
+        self.rpath = join(DATA_DIR, 'write_protected_file.txt')
+        self.rwpath = join(DATA_DIR, 'normal_file.txt')
         # Make sure rpath is not writable !
         os.chmod(self.rpath, 33060)
         # Make sure rwpath is writable !
diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py
index a458e77..2bb09a5 100644
--- a/test/unittest_testlib.py
+++ b/test/unittest_testlib.py
@@ -267,7 +267,7 @@ class TestlibTC(TestCase):
         tc = MyTC('test_1')
         self.assertEqual(tc.datapath('bar'), join('foo', 'bar'))
         # instance's custom datadir
-        self.skipTest('should this really works?')
+        self.skipTest('should this really work?')
         tc.datadir = 'spam'
         self.assertEqual(tc.datapath('bar'), join('spam', 'bar'))