From e54cfec5b47cefaf46196b144182206d00eaf810 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 16 May 2017 13:37:43 +0200 Subject: [PATCH] default to index mode of deltatar object when choosing extension For external use. --- deltatar/deltatar.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) 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 -- 1.7.1