jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/813360 )
Change subject: [IMPR] Don't use too many return statements in open_archive
......................................................................
[IMPR] Don't use too many return statements in open_archive
Change-Id: I24e37a3cd780ff319d049f72fe9067607dd3d953
---
M pywikibot/tools/__init__.py
1 file changed, 20 insertions(+), 18 deletions(-)
Approvals:
Matěj Suchánek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 92786ba..39758f6 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1188,12 +1188,12 @@
if extension == 'bz2':
if isinstance(bz2, ImportError):
raise bz2
- return bz2.BZ2File(filename, mode)
+ binary = bz2.BZ2File(filename, mode)
- if extension == 'gz':
- return gzip.open(filename, mode)
+ elif extension == 'gz':
+ binary = gzip.open(filename, mode)
- if extension == '7z':
+ elif extension == '7z':
if mode != 'rb':
raise NotImplementedError('It is not possible to write a 7z file.')
@@ -1203,25 +1203,27 @@
stderr=subprocess.PIPE,
bufsize=65535)
except OSError:
- raise ValueError('7za is not installed or cannot '
- 'uncompress "{}"'.format(filename))
- else:
- stderr = process.stderr.read()
- process.stderr.close()
- if stderr != b'':
- process.stdout.close()
- raise OSError(
- 'Unexpected STDERR output from 7za {}'.format(stderr))
- return process.stdout
+ raise ValueError('7za is not installed or cannot uncompress
"{}"'
+ .format(filename))
- if extension in ('lzma', 'xz'):
+ stderr = process.stderr.read()
+ process.stderr.close()
+ if stderr != b'':
+ process.stdout.close()
+ raise OSError(
+ 'Unexpected STDERR output from 7za {}'.format(stderr))
+ binary = process.stdout
+
+ elif extension in ('lzma', 'xz'):
if isinstance(lzma, ImportError):
raise lzma
lzma_fmts = {'lzma': lzma.FORMAT_ALONE, 'xz': lzma.FORMAT_XZ}
- return lzma.open(filename, mode, format=lzma_fmts[extension])
+ binary = lzma.open(filename, mode, format=lzma_fmts[extension])
- # assume it's an uncompressed file
- return open(filename, 'rb')
+ else: # assume it's an uncompressed file
+ binary = open(filename, 'rb')
+
+ return binary
def merge_unique_dicts(*args, **kwargs):
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/813360
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I24e37a3cd780ff319d049f72fe9067607dd3d953
Gerrit-Change-Number: 813360
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged