From 6a026ecff1722046e76d148db9f6563c7385b8de Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 8 Jan 2017 11:59:43 +0100 Subject: [PATCH] Fix for typo in attribute name --- fs_uae_wrapper/file_archive.py | 14 +++++++------- tests/test_file_archive.py | 11 +++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/fs_uae_wrapper/file_archive.py b/fs_uae_wrapper/file_archive.py index c165568..03533e4 100644 --- a/fs_uae_wrapper/file_archive.py +++ b/fs_uae_wrapper/file_archive.py @@ -17,15 +17,15 @@ class Archive(object): def __init__(self): self.archiver = path.which(self.ARCH) - self._compess = self.archiver - self._decompess = self.archiver + self._compress = self.archiver + self._decompress = self.archiver def create(self, arch_name, files=None): """ Create archive. Return True on success, False otherwise. """ files = files if files else ['.'] - result = subprocess.call([self._compess] + self.ADD + [arch_name] + result = subprocess.call([self._compress] + self.ADD + [arch_name] + files) if result != 0: sys.stderr.write("Unable to create archive `%s'\n" % arch_name) @@ -40,7 +40,7 @@ class Archive(object): sys.stderr.write("Archive `%s' doesn't exists.\n" % arch_name) return False - result = subprocess.call([self._decompess] + self.EXTRACT + + result = subprocess.call([self._decompress] + self.EXTRACT + [arch_name]) if result != 0: sys.stderr.write("Unable to extract archive `%s'\n" % arch_name) @@ -55,7 +55,7 @@ class TarArchive(Archive): def create(self, arch_name, files=None): files = files if files else sorted(os.listdir('.')) - result = subprocess.call([self._compess] + self.ADD + [arch_name] + + result = subprocess.call([self._compress] + self.ADD + [arch_name] + files) if result != 0: sys.stderr.write("Unable to create archive `%s'\n" % arch_name) @@ -86,7 +86,7 @@ class ZipArchive(Archive): def __init__(self): super(ZipArchive, self).__init__() if self.archiver == 'zip': - self._decompess = path.which('unzip') + self._decompress = path.which('unzip') ZipArchive.ADD = ['-r'] ZipArchive.EXTRACT = [] @@ -116,7 +116,7 @@ class RarArchive(Archive): 'supported by unrar.\n') return False - result = subprocess.call([self._compess] + self.ADD + [arch_name] + + result = subprocess.call([self._compress] + self.ADD + [arch_name] + files) if result != 0: sys.stderr.write("Unable to create archive `%s'\n" % arch_name) diff --git a/tests/test_file_archive.py b/tests/test_file_archive.py index 836c54a..6154ec7 100644 --- a/tests/test_file_archive.py +++ b/tests/test_file_archive.py @@ -143,7 +143,6 @@ class TestArchive(TestCase): self.assertFalse(arch.create('foo.tar')) call.assert_called_once_with(['tar', 'cf', 'foo.tar', 'bar', 'foo']) - @mock.patch('fs_uae_wrapper.path.which') @mock.patch('subprocess.call') def test_lha(self, call, which): @@ -226,8 +225,8 @@ class TestArchive(TestCase): which.side_effect = ['zip', 'unzip'] arch = file_archive.ZipArchive() - self.assertEqual(arch._compess, 'zip') - self.assertEqual(arch._decompess, 'unzip') + self.assertEqual(arch._compress, 'zip') + self.assertEqual(arch._decompress, 'unzip') @mock.patch('fs_uae_wrapper.path.which') @mock.patch('subprocess.call') @@ -268,7 +267,7 @@ class TestArchive(TestCase): call.reset_mock() call.return_value = 0 - arch._compess = arch._decompess = arch.archiver = 'unrar' + arch._compress = arch._decompress = arch.archiver = 'unrar' self.assertFalse(arch.create('foo')) call.assert_not_called() @@ -308,11 +307,11 @@ class TestArchivers(TestCase): archivers = file_archive.Archivers self.assertEqual(archivers.get_extension_by_name('tar'), '.tar') self.assertEqual(archivers.get_extension_by_name('tgz'), '.tar.gz') - self.assertEqual(archivers.get_extension_by_name('tar.bz2'), '.tar.bz2') + self.assertEqual(archivers.get_extension_by_name('tar.bz2'), + '.tar.bz2') self.assertEqual(archivers.get_extension_by_name('tar.xz'), '.tar.xz') self.assertEqual(archivers.get_extension_by_name('rar'), '.rar') self.assertEqual(archivers.get_extension_by_name('7z'), '.7z') self.assertEqual(archivers.get_extension_by_name('lha'), '.lha') self.assertEqual(archivers.get_extension_by_name('lzx'), '.lzx') self.assertIsNone(archivers.get_extension_by_name('ace')) -