From: Philipp Gesang <philipp.gesang@intra2net.com>
Date: Tue, 16 May 2017 11:37:43 +0000 (+0200)
Subject: default to index mode of deltatar object when choosing extension
X-Git-Tag: v2.2~7^2~110
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=e54cfec5b47cefaf46196b144182206d00eaf810;p=python-delta-tar

default to index mode of deltatar object when choosing extension

For external use.
---

diff --git a/deltatar/deltatar.py b/deltatar/deltatar.py
index 0e42260..46c9155 100644
--- a/deltatar/deltatar.py
+++ b/deltatar/deltatar.py
@@ -268,7 +268,7 @@ class DeltaTar(object):
         if volume_name_func is not None:
             self.volume_name_func = volume_name_func
 
-    def pick_extension(self, kind, mode):
+    def pick_extension(self, kind, mode=None):
         """
         Choose the extension depending on a) the kind of file given, b) the
         processing mode, and c) the current encryption settings.
@@ -276,8 +276,10 @@ class DeltaTar(object):
         ret = ""
         if kind == PDT_TYPE_ARCHIVE:
             ret += ".tar"
+        if mode is None:
+            mode = self.__index_extensions_dict [self.index_mode]
         ret += mode
-        if self.encryptor is not None or self.decryptor is not None:
+        if self.password is not None:
             ret += "." + PDTCRYPT_EXTENSION
         return ret