Remove orange support.

doc/changelog.txt

@@ -8,6 +8,7 @@
 * Added support for lcap handling CAB (.cab) archives.
 * Added support for shar handling SHAR (.shar) shell archives.
 * Added support for unadf handling ADF (.adf) amiga disk archives.
+* Removed support for orange handling self-extracting installers.
 * Generate standalone Windows .exe and Linux .rpm installer.
 * Initialize the internal MIME database correct on all platforms.
 * Improved option compatibility for the ar, cpio and tar programs.

patoolib/__init__.py

@@ -118,7 +118,7 @@ ArchivePrograms = {
         'list': ('py_echo', '7z', '7za'),
     },
     'cab': {
-        'extract': ('cabextract', '7z', 'orange'),
+        'extract': ('cabextract', '7z'),
         'create': ('lcab',),
         'list': ('cabextract', '7z'),
         'test': ('cabextract', '7z'),

patoolib/programs/orange.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2011-2012 Bastian Kleineidam
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Archive commands for the orange program."""
-
-def extract_cab (archive, compression, cmd, **kwargs):
-    """Extract a CAB archive."""
-    cmdlist = [cmd, '-d', kwargs['outdir']]
-    if kwargs['verbose']:
-        cmdlist.append('-D 2')
-    else:
-        cmdlist.append('-D 1')
-    cmdlist.append(archive)
-    return cmdlist

tests/test_archives.py

@@ -334,11 +334,6 @@ class TestArchives (ArchiveTest):
         self.archive_list('t.cab')
         self.archive_extract('t.cab', check=None)
 
-    @needs_program('orange')
-    def test_orange (self):
-        self.program = 'orange'
-        self.archive_extract('t.cab')
-
     @needs_program('lcab')
     @needs_program('cabextract')
     def test_lcab (self):

tests/test_foo_archives.py

@@ -350,12 +350,6 @@ class TestArchives (ArchiveTest):
         self.archive_list('t.cab.foo')
         self.archive_extract('t.cab.foo', check=None)
 
-    @needs_program('file')
-    @needs_program('orange')
-    def test_orange (self):
-        self.program = 'orange'
-        self.archive_extract('t.cab.foo')
-
     @needs_program('file')
     @needs_program('arj')
     def test_arj (self):