From ec52ca9a823f8b01ef99ade9084d549f8f9edf12 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Thu, 1 Nov 2018 02:40:27 -0700 Subject: [PATCH] Better if/else branching. --- git_archive_all.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/git_archive_all.py b/git_archive_all.py index ea9e8c2..d1fe87d 100755 --- a/git_archive_all.py +++ b/git_archive_all.py @@ -149,15 +149,12 @@ def create(self, output_path, dry_run=False, output_format=None, compresslevel=N if output_format in self.ZIPFILE_FORMATS: from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED - if sys.version_info > (3, 7): - if compresslevel is not None: + if compresslevel is not None: + if sys.version_info > (3, 7): archive = ZipFile(path.abspath(output_path), 'w', compresslevel=compresslevel) else: - archive = ZipFile(path.abspath(output_path), 'w') - else: - if compresslevel is not None: raise ValueError("Compression level for zip archives requires Python 3.7+") - + else: archive = ZipFile(path.abspath(output_path), 'w') def add_file(file_path, arcname): @@ -173,15 +170,12 @@ def add_file(file_path, arcname): mode = self.TARFILE_FORMATS[output_format] - try: - if compresslevel is not None: + if compresslevel is not None: + try: archive = tarfile.open(path.abspath(output_path), mode, compresslevel=compresslevel) - else: - archive = tarfile.open(path.abspath(output_path), mode) - except TypeError: - if compresslevel is not None: + except TypeError: raise ValueError("{0} cannot be compressed".format(output_format)) - + else: archive = tarfile.open(path.abspath(output_path), mode) def add_file(file_path, arcname):